Translated general dialog

diff --git a/Translations/wm_de/resource.h b/Translations/wm_de/resource.h
index c6ded3695a8740a7f2416a6e542e2fc0eb517af8..b4b9187464bea5be26a1dd918ed66cef7fcb658e 100644 (file)
--- a/Translations/wm_de/resource.h
+++ b/Translations/wm_de/resource.h
@@ -62,6 +62,7 @@
 #define IDS_SETTINGS_GENERAL_RUN_ON_STARTUP 1050
 #define IDS_SETTINGS_GENERAL_ENABLE_LOGGING 1051
 #define IDS_SETTINGS_GENERAL_OPEN_LOG_FILE 1052
+#define IDS_SETTINGS_GENERAL_LANGUAGE_LABEL 1053
 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_TITLE 1101
 #define IDS_SETTINGS_BLUETOOTH_EDIT_DLG_TITLE 1102
 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_DEVICE_NAME_LABEL 1103

diff --git a/Translations/wm_de/wm_de.rc b/Translations/wm_de/wm_de.rc
index 70b0586295592f60c1542ea57e705f133947103c..1647795f1b7e65bcb4ccd4e7250fe03935dfea74 100644 (file)
Binary files a/Translations/wm_de/wm_de.rc and b/Translations/wm_de/wm_de.rc differ

diff --git a/WinMute/Settings_GeneralDlg.cpp b/WinMute/Settings_GeneralDlg.cpp
index dff661251db546ef4e2568d8e851b2a020090d76..7b875427d2adfa7c93276759e1a5e3168078e886 100644 (file)
--- a/WinMute/Settings_GeneralDlg.cpp
+++ b/WinMute/Settings_GeneralDlg.cpp
@@ -58,6 +58,15 @@ static void FillLanguageList(HWND hLanguageList, const SettingsGeneralData& dlgD
    ComboBox_SelectString(hLanguageList, 0, WMi18n::GetInstance().GetCurrentLanguageName().c_str());
 }
 
+static void LoadSettingsGeneralDlgTranslation(HWND hDlg)
+{
+   WMi18n &i18n = WMi18n::GetInstance();
+   i18n.SetItemText(hDlg, IDC_SELECT_LANGUAGE_LABEL, IDS_SETTINGS_GENERAL_LANGUAGE_LABEL);
+   i18n.SetItemText(hDlg, IDC_RUNONSTARTUP, IDS_SETTINGS_GENERAL_RUN_ON_STARTUP);
+   i18n.SetItemText(hDlg, IDC_ENABLELOGGING, IDS_SETTINGS_GENERAL_ENABLE_LOGGING);
+   i18n.SetItemText(hDlg, IDC_OPENLOG, IDS_SETTINGS_GENERAL_OPEN_LOG_FILE);
+}
+
 INT_PTR CALLBACK Settings_GeneralDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
    switch (msg) {
@@ -69,6 +78,7 @@ INT_PTR CALLBACK Settings_GeneralDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPA
       if (IsAppThemed()) {
          EnableThemeDialogTexture(hDlg, ETDT_ENABLETAB);
       }
+      LoadSettingsGeneralDlgTranslation(hDlg);
 
       SettingsGeneralData *dlgData = new SettingsGeneralData;
       memset(dlgData, 0, sizeof(*dlgData));

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
index b33f85a52b7ed0811d10fb206c5d4dd83f4ed8dd..3886c69c6643c8d7599012ca890b7d21e467ebae 100644 (file)
--- a/WinMute/WinMute.rc
+++ b/WinMute/WinMute.rc
@@ -81,9 +81,9 @@ BEGIN
     CONTROL         "Start WinMute on system startup",IDC_RUNONSTARTUP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,219,17
     CONTROL         "Enable logging",IDC_ENABLELOGGING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,219,15
-    PUSHBUTTON      "Open log file...",IDC_OPENLOG,22,71,58,15
-    LTEXT           "[log file path]",IDC_LOGFILEPATH,23,88,203,27
-    LTEXT           "Language",IDC_STATIC,7,14,41,10
+    PUSHBUTTON      "Open log file...",IDC_OPENLOG,22,71,104,16
+    LTEXT           "[log file path]",IDC_LOGFILEPATH,23,89,203,27
+    LTEXT           "Language",IDC_SELECT_LANGUAGE_LABEL,7,14,41,10
     COMBOBOX        IDC_LANGUAGE,51,12,87,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -656,6 +656,7 @@ BEGIN
     IDS_SETTINGS_GENERAL_RUN_ON_STARTUP "Start WinMute on system startup"
     IDS_SETTINGS_GENERAL_ENABLE_LOGGING "Enable logging"
     IDS_SETTINGS_GENERAL_OPEN_LOG_FILE "Open log file..."
+    IDS_SETTINGS_GENERAL_LANGUAGE_LABEL "Language"
 END
 
 STRINGTABLE

diff --git a/WinMute/resource.h b/WinMute/resource.h
index a374101484f5f5152043085719451fd448e7f9d3..d18b490d0ca9d6e5c2432912a271dd1a8e45e088 100644 (file)
--- a/WinMute/resource.h
+++ b/WinMute/resource.h
@@ -148,6 +148,8 @@
 #define IDC_LABEL_BT_DEVICE_NAME        1052
 #define IDS_SETTINGS_GENERAL_OPEN_LOG_FILE 1052
 #define IDC_BLUETOOTH_DESCRIPTION_LABEL 1053
+#define IDS_SETTINGS_GENERAL_LANGUAGE_LABEL 1053
+#define IDC_SELECT_LANGUAGE_LABEL       1054
 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_TITLE 1101
 #define IDS_SETTINGS_BLUETOOTH_EDIT_DLG_TITLE 1102
 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_DEVICE_NAME_LABEL 1103
@@ -203,7 +205,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        140
 #define _APS_NEXT_COMMAND_VALUE         40041
-#define _APS_NEXT_CONTROL_VALUE         1054
+#define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif