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

53 files changed, 269 insertions, 943 deletions

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/moduldlg.src b/basctl/source/basicide/moduldlg.src
deleted file mode 100644
index 5f1a23ce7699..000000000000
--- a/basctl/source/basicide/moduldlg.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 <basidesh.hrc>
-
-String RID_STR_EXPORTPACKAGE
-{
-    Text [ en-US ] = "Export library as extension";
-};
-
-String RID_STR_EXPORTBASIC
-{
-    Text [ en-US ] = "Export as BASIC library";
-};
-
-String RID_STR_PACKAGE_BUNDLE
-{
-    Text [ en-US ] = "Extension";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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>