1 files changed, 18 insertions, 17 deletions
diff --git a/src/m_email/EMailModule.cpp b/src/m_email/EMailModule.cpp
index ce36887..48b24e1 100644
--- a/src/m_email/EMailModule.cpp
+++ b/src/m_email/EMailModule.cpp
@@ -80,6 +80,7 @@
 #include "EMailBasicGpgOpera.h"
 #include "EMailHelper.h"
 #include "EMailVerificationPayload.h"
+#include "GFModuleTr.h"
 
 namespace {
 
@@ -436,17 +437,17 @@ auto OnActivate() -> GFResult {
   // translates it when shown, after the module translators are installed.
   const bool editor = gf::ui::RegisterNativeWidgetFactory<EMailPageView>(
       "editor",
-      {GC_TR("E-Mail"), "", "eml",
-       GC_TR("E-Mail Message (*.eml);;All Files (*)"), ":/icons/email.png", 0,
-       0},
+      {GTrC::Noop("E-Mail"), "", "eml",
+       GTrC::Noop("E-Mail Message (*.eml);;All Files (*)"), ":/icons/email.png",
+       0, 0},
       [](const QCborMap& /*args*/) { return new EMailPageView(); });
   const bool settings = gf::ui::RegisterNativeWidget<EMailAccountSettingsPage>(
       "settings",
-      {GC_TR("Mail Accounts"), GC_TR("mail,email,imap,smtp,account,send"), "",
-       "", "", 0, 0},
+      {GTrC::Noop("Mail Accounts"),
+       GTrC::Noop("mail,email,imap,smtp,account,send"), "", "", "", 0, 0},
       [](const QCborMap& /*args*/) { return new EMailAccountSettingsPage(); });
   const bool imap = gf::ui::RegisterNativeWidget<EMailImapController>(
-      "imap", {GC_TR("IMAP Controller"), "", "", "", "", 1100, 720},
+      "imap", {GTrC::Noop("IMAP Controller"), "", "", "", "", 1100, 720},
       [](const QCborMap& /*args*/) {
         auto* controller = new EMailImapController();
         // The narrow boundary: raw bytes in, a document out. The controller
@@ -1694,8 +1695,8 @@ namespace {
 struct NewMessage {
   static constexpr gf::cmd::Meta kMeta{
       GF_MODULE_ID ".new_message",
-      GC_TR("Mail Editor"),
-      GC_TR("Open a new text editor for email."),
+      GTrC::Noop("Mail Editor"),
+      GTrC::Noop("Open a new text editor for email."),
       "",
       0,
       gf::cmd::kNeedsGuiThread};
@@ -1713,12 +1714,13 @@ auto DoNewMessage(const gf::cmd::CommandContext& /*ctx*/,
 
 /// Advanced > Open IMAP Controller.
 struct OpenImapController {
-  static constexpr gf::cmd::Meta kMeta{GF_MODULE_ID ".open_imap_controller",
-                                       GC_TR("Open IMAP Controller"),
-                                       GC_TR("Open IMAP Controller Dialog"),
-                                       "",
-                                       0,
-                                       gf::cmd::kNeedsGuiThread};
+  static constexpr gf::cmd::Meta kMeta{
+      GF_MODULE_ID ".open_imap_controller",
+      GTrC::Noop("Open IMAP Controller"),
+      GTrC::Noop("Open IMAP Controller Dialog"),
+      "",
+      0,
+      gf::cmd::kNeedsGuiThread};
   using Args = gf::cmd::Unit;
   using Result = gf::cmd::Unit;
 };
@@ -1731,9 +1733,8 @@ auto DoOpenImapController(const gf::cmd::CommandContext& /*ctx*/,
   if (!EMailImapController::HasUsableAccount()) {
     Commands().Invoke<gf::cmd::host::AppMessage>(
         {gf::cmd::host::AppMessage::Severity::kInfo,
-         QCoreApplication::translate("GTrC", "No mail account"),
-         QCoreApplication::translate(
-             "GTrC",
+         GTrC::tr("No mail account"),
+         GTrC::tr(
              "Configure a mail account with IMAP enabled in Settings first.")});
     return gf::cmd::Outcome<gf::cmd::Unit>::Success({});
   }