#26 Translation of popup messages

diff --git a/Translations/strings.ods b/Translations/strings.ods
index 70f39bfdf6468ed9acd71173ba75f88a311bfba9..2c7fdebc513ea0217558fb4200ba90e3ebc44d39 100644 (file)
Binary files a/Translations/strings.ods and b/Translations/strings.ods differ

diff --git a/Translations/wm_de/resource.h b/Translations/wm_de/resource.h
index fa888d8fad4a4bf0316faf604dae0e9a747c3c20..011bcf4357523862191f46e0d7202f8e65802ae6 100644 (file)
--- a/Translations/wm_de/resource.h
+++ b/Translations/wm_de/resource.h
@@ -12,6 +12,19 @@
 #define IDS_WM_ERROR_WINDOWS_SUPPORT_TITLE 201
 #define IDS_WM_ERROR_WINDOWS_SUPPORT_TEXT2 202
 #define IDS_WM_ERROR_WINDOWS_SUPPORT_TEXT 202
+#define IDS_POPUP_REMOTE_SESSION_DETECTED_TITLE 301
+#define IDS_POPUP_REMOTE_SESSION_DETECTED_TEXT 302
+#define IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TITLE 303
+#define IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TEXT 304
+#define IDS_POPUP_WLAN_MUTING_DISABLED_TITLE 305
+#define IDS_POPUP_WLAN_MUTING_DISABLED_TEXT 306
+#define IDS_POPUP_QUIET_HOURS_STARTED_TITLE 307
+#define IDS_POPUP_QUIET_HOURS_STARTED_TEXT 308
+#define IDS_POPUP_QUIET_HOURS_ENDED_TITLE 309
+#define IDS_POPUP_QUIET_HOURS_ENDED_TEXT 310
+#define IDS_POPUP_WORKSTATION_MUTED_TITLE 311
+#define IDS_POPUP_WLAN_NOT_ON_MUTE_LIST_TEXT 312
+#define IDS_POPUP_WLAN_IS_ON_MUTE_LIST_TEXT 313
 
 // Next default values for new objects
 // 

diff --git a/Translations/wm_de/wm_de.rc b/Translations/wm_de/wm_de.rc
index ef05e9e79fb2418e7c4e5c98c593e5b6409948fb..ec3ea0cd5b3fb1e794970dc5edc24f460d63f0bb 100644 (file)
Binary files a/Translations/wm_de/wm_de.rc and b/Translations/wm_de/wm_de.rc differ

diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp
index c22488a349bdfa43fb269fe790c006e9baf45f35..77ce372f1fe391042c672836ae34cd956730d374 100644 (file)
--- a/WinMute/WinMute.cpp
+++ b/WinMute/WinMute.cpp
@@ -289,8 +289,8 @@ bool WinMute::Init()
    if (settings_.QueryValue(SettingsKey::MUTE_ON_RDP)
        && IsCurrentSessionRemoteable()) {
       trayIcon_.ShowPopup(
-         L"Remote Session detected",
-         L"All audio endpoints have been muted");
+         i18n.GetTextW(IDS_POPUP_REMOTE_SESSION_DETECTED_TITLE),
+         i18n.GetTextW(IDS_POPUP_REMOTE_SESSION_DETECTED_TEXT));
       muteCtrl_.SetMute(true);
    }
 
@@ -347,9 +347,8 @@ bool WinMute::LoadSettings()
    } else {
       if (!btDetector_.Init(hWnd_)) {
          trayIcon_.ShowPopup(
-            L"Bluetooth muting disabled",
-            L"Bluetooth is not available or disabled. "
-            L"Bluetooth muting will be disabled on this computer");
+            i18n.GetTextW(IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TITLE),
+            i18n.GetTextW(IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TEXT));
          settings_.SetValue(SettingsKey::MUTE_ON_BLUETOOTH, FALSE);
       } else {
          muteCtrl_.SetMuteOnBluetoothDisconnect(true);
@@ -364,9 +363,8 @@ bool WinMute::LoadSettings()
    } else {
       if (!wifiDetector_.Init(hWnd_)) {
          trayIcon_.ShowPopup(
-            L"WLAN muting disabled",
-            L"WLAN is not available or disabled. "
-            L"WLAN muting will be disabled on this computer");
+            i18n.GetTextW(IDS_POPUP_WLAN_MUTING_DISABLED_TITLE),
+            i18n.GetTextW(IDS_POPUP_WLAN_MUTING_DISABLED_TEXT));
          settings_.SetValue(SettingsKey::MUTE_ON_WLAN, FALSE);
       } else {
          const bool isMuteList = !settings_.QueryValue(SettingsKey::MUTE_ON_WLAN_ALLOWLIST);
@@ -554,8 +552,8 @@ LRESULT CALLBACK WinMute::WindowProc(
       muteCtrl_.NotifyQuietHours(true);
       if (settings_.QueryValue(SettingsKey::QUIETHOURS_NOTIFICATIONS)) {
          trayIcon_.ShowPopup(
-            L"WinMute: Quiet hours started",
-            L"Your workstation audio will now be muted.");
+            i18n.GetTextW(IDS_POPUP_QUIET_HOURS_STARTED_TITLE),
+            i18n.GetTextW(IDS_POPUP_QUIET_HOURS_STARTED_TEXT));
       }
       quietHours_.SetEnd();
       return 0;
@@ -563,8 +561,8 @@ LRESULT CALLBACK WinMute::WindowProc(
       muteCtrl_.NotifyQuietHours(false);
       if (settings_.QueryValue(SettingsKey::QUIETHOURS_NOTIFICATIONS)) {
          trayIcon_.ShowPopup(
-            L"WinMute: Quiet Hours ended",
-            L"Your workstation audio has been restored.");
+            i18n.GetTextW(IDS_POPUP_QUIET_HOURS_ENDED_TITLE),
+            i18n.GetTextW(IDS_POPUP_QUIET_HOURS_ENDED_TEXT));
       }
       if (settings_.QueryValue(SettingsKey::QUIETHOURS_FORCEUNMUTE)) {
          muteCtrl_.SetMute(false);
@@ -586,20 +584,20 @@ LRESULT CALLBACK WinMute::WindowProc(
       if (muteConfig_.muteOnWlan) {
          if (wParam == 1) { // Connected
             if (settings_.QueryValue(SettingsKey::NOTIFICATIONS_ENABLED)) {
-               wchar_t msgBuf[260] = { 0 };
+               std::wstring popupMsg;
                wchar_t *wifiName = reinterpret_cast<wchar_t*>(lParam);
                if (settings_.QueryValue(SettingsKey::MUTE_ON_WLAN_ALLOWLIST)) {
-                  StringCchPrintfW(
-                     msgBuf, ARRAY_SIZE(msgBuf),
-                     L"WLAN \"%s\"network is not on allowed list.\n",
-                     wifiName);
+                  popupMsg = std::vformat(
+                     i18n.GetTextW(IDS_POPUP_WLAN_NOT_ON_MUTE_LIST_TEXT),
+                     std::make_wformat_args(wifiName));
                }  else {
-                  StringCchPrintfW(
-                     msgBuf, ARRAY_SIZE(msgBuf),
-                     L"WLAN network \"%s\" is configured for AutoMute.",
-                     wifiName);
+                  popupMsg = std::vformat(
+                     i18n.GetTextW(IDS_POPUP_WLAN_IS_ON_MUTE_LIST_TEXT),
+                     std::make_wformat_args(wifiName));
                }
-               trayIcon_.ShowPopup(L"Workstation muted", msgBuf);
+               trayIcon_.ShowPopup(
+                  i18n.GetTextW(IDS_POPUP_WORKSTATION_MUTED_TITLE),
+                  popupMsg);
                delete [] wifiName;
             }
             muteCtrl_.SetMute(true);

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
index 7f0630b7ac5afd5729b73f3dfa7a54cd5a447093..f623d47eb31f26dba94d005c023b15ba9660e0f9 100644 (file)
--- a/WinMute/WinMute.rc
+++ b/WinMute/WinMute.rc
@@ -558,6 +558,36 @@ STRINGTABLE
 BEGIN
     IDS_WM_ERROR_WINDOWS_SUPPORT_TITLE 
                             "Only Windows Vista and newer is supported"
+    IDS_WM_ERROR_WINDOWS_SUPPORT_TEXT 
+                            "If you need support for Windows XP, please download WinMute version 1.4.2 or lower."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_POPUP_REMOTE_SESSION_DETECTED_TITLE "Remote Session detected"
+    IDS_POPUP_REMOTE_SESSION_DETECTED_TEXT 
+                            "All audio endpoints have been muted"
+    IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TITLE "Bluetooth muting disabled"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TEXT 
+                            "Bluetooth is not available or disabled. Bluetooth muting will be disabled on this computer."
+    IDS_POPUP_WLAN_MUTING_DISABLED_TITLE "WLAN muting disabled"
+    IDS_POPUP_WLAN_MUTING_DISABLED_TEXT 
+                            "WLAN is not available or disabled. WLAN muting will be disabled on this computer"
+    IDS_POPUP_QUIET_HOURS_STARTED_TITLE "WinMute: Quiet hours started"
+    IDS_POPUP_QUIET_HOURS_STARTED_TEXT 
+                            "Your workstation audio will now be muted."
+    IDS_POPUP_QUIET_HOURS_ENDED_TITLE "WinMute: Quiet Hours ended"
+    IDS_POPUP_QUIET_HOURS_ENDED_TEXT 
+                            "Your workstation audio has been restored."
+    IDS_POPUP_WORKSTATION_MUTED_TITLE "Workstation muted"
+    IDS_POPUP_WLAN_NOT_ON_MUTE_LIST_TEXT 
+                            "WLAN network ""{}"" is not on allowed list."
+    IDS_POPUP_WLAN_IS_ON_MUTE_LIST_TEXT 
+                            "WLAN network ""{}"" is configured for AutoMute."
 END
 
 #endif    // English (United Kingdom) resources

diff --git a/WinMute/resource.h b/WinMute/resource.h
index 327331cb6f9506ad4c9190dc1d93395bb024d634..7d82002af33156bd210258ed33535b826bfa1833 100644 (file)
--- a/WinMute/resource.h
+++ b/WinMute/resource.h
@@ -31,8 +31,20 @@
 #define IDD_DIALOG2                     137
 #define IDD_MANAGE_ENDPOINTS_ADD        137
 #define IDS_WM_ERROR_WINDOWS_SUPPORT_TITLE 201
-#define IDS_STRING202                   202
 #define IDS_WM_ERROR_WINDOWS_SUPPORT_TEXT 202
+#define IDS_POPUP_REMOTE_SESSION_DETECTED_TITLE 301
+#define IDS_POPUP_REMOTE_SESSION_DETECTED_TEXT 302
+#define IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TITLE 303
+#define IDS_POPUP_BLUETOOTH_MUTING_DISABLED_TEXT 304
+#define IDS_POPUP_WLAN_MUTING_DISABLED_TITLE 305
+#define IDS_POPUP_WLAN_MUTING_DISABLED_TEXT 306
+#define IDS_POPUP_QUIET_HOURS_STARTED_TITLE 307
+#define IDS_POPUP_QUIET_HOURS_STARTED_TEXT 308
+#define IDS_POPUP_QUIET_HOURS_ENDED_TITLE 309
+#define IDS_POPUP_QUIET_HOURS_ENDED_TEXT 310
+#define IDS_POPUP_WORKSTATION_MUTED_TITLE 311
+#define IDS_POPUP_WLAN_NOT_ON_MUTE_LIST_TEXT 312
+#define IDS_POPUP_WLAN_IS_ON_MUTE_LIST_TEXT 313
 #define IDC_LINK_HOMEPAGE               1001
 #define IDC_LINK_SUPPORT                1002
 #define IDC_LINK_PROJECT                1002