10 files changed, 33 insertions, 103 deletions
diff --git a/writerperfect/AllLangMoTarget_wpt.mk b/writerperfect/AllLangMoTarget_wpt.mk
new file mode 100644
index 000000000000..433bb66e8b9e
--- /dev/null
+++ b/writerperfect/AllLangMoTarget_wpt.mk
@@ -0,0 +1,13 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,wpt))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,wpt,writerperfect))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/AllLangResTarget_writerperfect.mk b/writerperfect/AllLangResTarget_writerperfect.mk
deleted file mode 100644
index bca319cd1ea3..000000000000
--- a/writerperfect/AllLangResTarget_writerperfect.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,writerperfect))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,writerperfect,writerperfect))
-
-$(eval $(call gb_AllLangResTarget_add_srs,writerperfect,\
-	writerperfect/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,writerperfect/res))
-
-$(eval $(call gb_SrsTarget_set_include,writerperfect/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,writerperfect/res,\
-    writerperfect/source/common/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index 7f95b28ffdb7..8f96421d68ab 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -34,7 +34,4 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_draw,\
 	writerperfect/qa/unit/WpftDrawFilterTest \
 ))
 
-$(call gb_CppunitTest_get_target,writerperfect_draw): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index e257fb4f4f09..b2cf95a5dbb2 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -34,7 +34,4 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_impress,\
 	writerperfect/qa/unit/WpftImpressFilterTest \
 ))
 
-$(call gb_CppunitTest_get_target,writerperfect_impress): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 0b862086f5a9..b2102c54b987 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
 	Library_wpftimpress \
 	Library_wpftwriter \
 	Library_writerperfect \
+	UIConfig_writerperfect \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,writerperfect,\
-	AllLangResTarget_writerperfect \
-	UIConfig_writerperfect \
+	AllLangMoTarget_wpt \
 ))
 
 $(eval $(call gb_Module_add_check_targets,writerperfect,\
diff --git a/writerperfect/inc/WPFTResMgr.hxx b/writerperfect/inc/WPFTResMgr.hxx
index 54de1e4f0e06..ccc75246b102 100644
--- a/writerperfect/inc/WPFTResMgr.hxx
+++ b/writerperfect/inc/WPFTResMgr.hxx
@@ -5,16 +5,16 @@
 
 #include "writerperfectdllapi.h"
 
-#include <tools/resid.hxx>
+#include <tools/resmgr.hxx>
 
-struct WRITERPERFECT_DLLPUBLIC WPFTResMgr
+struct WRITERPERFECT_DLLPUBLIC WPFTResLocale
 {
-    static ResMgr &GetResMgr();
+    static std::locale& GetResLocale();
 };
 
-inline OUString WpResId(sal_uInt16 nId)
+inline OUString WpResId(const char* pId)
 {
-    return ResId(nId, WPFTResMgr::GetResMgr());
+    return Translate::get(pId, WPFTResLocale::GetResLocale());
 }
 
 #endif
diff --git a/writerperfect/inc/strings.hrc b/writerperfect/inc/strings.hrc
index e18214f511df..9f9b60d8bee8 100644
--- a/writerperfect/inc/strings.hrc
+++ b/writerperfect/inc/strings.hrc
@@ -10,15 +10,15 @@
 #ifndef INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 #define INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 
-#define RES_START   1000
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define STR_ENCODING_DIALOG_TITLE                (RES_START + 1)
-#define STR_ENCODING_DIALOG_TITLE_MSWORKS        (RES_START + 2)
-#define STR_ENCODING_DIALOG_TITLE_MSWRITE        (RES_START + 3)
-#define STR_ENCODING_DIALOG_TITLE_DOSWORD        (RES_START + 4)
-#define STR_ENCODING_DIALOG_TITLE_LOTUS          (RES_START + 5)
-#define STR_ENCODING_DIALOG_TITLE_SYMPHONY       (RES_START + 6)
-#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO     (RES_START + 7)
+#define STR_ENCODING_DIALOG_TITLE               NC_("STR_ENCODING_DIALOG_TITLE", "Import file")
+#define STR_ENCODING_DIALOG_TITLE_MSWORKS       NC_("STR_ENCODING_DIALOG_TITLE_MSWORKS", "Import MS Works file")
+#define STR_ENCODING_DIALOG_TITLE_MSWRITE       NC_("STR_ENCODING_DIALOG_TITLE_MSWRITE", "Import MS Write file")
+#define STR_ENCODING_DIALOG_TITLE_DOSWORD       NC_("STR_ENCODING_DIALOG_TITLE_DOSWORD", "Import MS Word for DOS file")
+#define STR_ENCODING_DIALOG_TITLE_LOTUS         NC_("STR_ENCODING_DIALOG_TITLE_LOTUS", "Import Lotus file")
+#define STR_ENCODING_DIALOG_TITLE_SYMPHONY      NC_("STR_ENCODING_DIALOG_TITLE_SYMPHONY", "Import Symphony file")
+#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO    NC_("STR_ENCODING_DIALOG_TITLE_QUATTROPRO", "Import Quattro Pro file")
 
 #endif
 
diff --git a/writerperfect/source/common/WPFTResMgr.cxx b/writerperfect/source/common/WPFTResMgr.cxx
index 9cc22f365140..c207d25ffca9 100644
--- a/writerperfect/source/common/WPFTResMgr.cxx
+++ b/writerperfect/source/common/WPFTResMgr.cxx
@@ -2,14 +2,13 @@
 
 #include "WPFTResMgr.hxx"
 
-#include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-ResMgr &WPFTResMgr::GetResMgr()
+std::locale &WPFTResLocale::GetResLocale()
 {
-    static ResMgr *const pResMgr(ResMgr::CreateResMgr("writerperfect", Application::GetSettings().GetUILanguageTag()));
-    return *pResMgr;
+    static std::locale loc(Translate::Create("wpt", Application::GetSettings().GetUILanguageTag()));
+    return loc;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/strings.src b/writerperfect/source/common/strings.src
deleted file mode 100644
index fb9b0bad0e35..000000000000
--- a/writerperfect/source/common/strings.src
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "strings.hrc"
-
-String STR_ENCODING_DIALOG_TITLE
-{
-    Text[en-US] = "Import file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_MSWORKS
-{
-    Text[en-US] = "Import MS Works file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_MSWRITE
-{
-    Text[en-US] = "Import MS Write file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_DOSWORD
-{
-    Text[en-US] = "Import MS Word for DOS file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_LOTUS
-{
-    Text[en-US] = "Import Lotus file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_SYMPHONY
-{
-    Text[en-US] = "Import Symphony file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_QUATTROPRO
-{
-    Text[en-US] = "Import Quattro Pro file";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
index 40d2652f0f09..d18340269df1 100644
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
+++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="wpt">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkDialog" id="WPFTEncodingDialog">
     <property name="can_focus">False</property>
@@ -60,7 +60,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">_Character set:</property>
+            <property name="label" translatable="yes" context="wpftencodingdialog|label">_Character set:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">comboboxtext</property>
           </object>