[SYSDM] Make MHz and GHz strings translatable

diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c
index 85f83fa..032a4b1 100644 (file)
--- a/dll/cpl/sysdm/general.c
+++ b/dll/cpl/sysdm/general.c
@@ -389,7 +389,7 @@ static VOID MakeFloatValueString(DOUBLE* dFloatValue, LPTSTR szOutput, LPTSTR sz
 
 static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID)
 {
-    TCHAR szBuf[64];
+    TCHAR szBuf[64], szHz[16];
     DWORD BufSize = sizeof(DWORD);
     DWORD Type = REG_SZ;
     PROCESSOR_POWER_INFORMATION ppi;
@@ -405,12 +405,20 @@ static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID)
     {
         if (ppi.CurrentMhz < 1000)
         {
-            wsprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz);
+            if (!LoadString(hApplet, IDS_MEGAHERTZ, szHz, _countof(szHz)))
+            {
+                return;
+            }
+            StringCchPrintf(szBuf, _countof(szBuf), _T("%lu %s"), ppi.CurrentMhz, szHz);
         }
         else
         {
             double flt = ppi.CurrentMhz / 1000.0;
-            MakeFloatValueString(&flt, szBuf, _T("GHz"));
+            if (!LoadString(hApplet, IDS_GIGAHERTZ, szHz, _countof(szHz)))
+            {
+                return;
+            }
+            MakeFloatValueString(&flt, szBuf, szHz);
         }
 
         SetDlgItemText(hwnd, uID, szBuf);

diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc
index 44ae767..e69cd2f 100644 (file)
--- a/dll/cpl/sysdm/lang/bg-BG.rc
+++ b/dll/cpl/sysdm/lang/bg-BG.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "ГБ памет"
     IDS_TERABYTE "ТБ памет"
     IDS_PETABYTE "ПБ памет"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Променлива"
     IDS_VALUE "Стойност"
     IDS_NO_DUMP "(Няма)"

diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc
index e1ff1ac..09a89ce 100644 (file)
--- a/dll/cpl/sysdm/lang/cs-CZ.rc
+++ b/dll/cpl/sysdm/lang/cs-CZ.rc
@@ -284,6 +284,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Proměnná"
     IDS_VALUE "Hodnota"
     IDS_NO_DUMP "(Není)"

diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc
index 15379b6..5f78225 100644 (file)
--- a/dll/cpl/sysdm/lang/da-DK.rc
+++ b/dll/cpl/sysdm/lang/da-DK.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB of RAM"
     IDS_TERABYTE "TB of RAM"
     IDS_PETABYTE "PB of RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Value"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc
index 81ba510..eb70c4f 100644 (file)
--- a/dll/cpl/sysdm/lang/de-DE.rc
+++ b/dll/cpl/sysdm/lang/de-DE.rc
@@ -288,6 +288,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Wert"
     IDS_NO_DUMP "(Keine)"

diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc
index 188dcb9..bb758e9 100644 (file)
--- a/dll/cpl/sysdm/lang/el-GR.rc
+++ b/dll/cpl/sysdm/lang/el-GR.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB μνήμης RAM"
     IDS_TERABYTE "TB μνήμης RAM"
     IDS_PETABYTE "PB μνήμης RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Μεταβλητή"
     IDS_VALUE "Τιμή"
     IDS_NO_DUMP "(Κανένα)"

diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc
index 06ee1b5..83b5e42 100644 (file)
--- a/dll/cpl/sysdm/lang/en-US.rc
+++ b/dll/cpl/sysdm/lang/en-US.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB of RAM"
     IDS_TERABYTE "TB of RAM"
     IDS_PETABYTE "PB of RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Value"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc
index ab0ae13..7c1e82c 100644 (file)
--- a/dll/cpl/sysdm/lang/es-ES.rc
+++ b/dll/cpl/sysdm/lang/es-ES.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB de RAM"
     IDS_TERABYTE "TB de RAM"
     IDS_PETABYTE "PB de RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Valor"
     IDS_NO_DUMP "(Ninguno)"

diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc
index e77c923..e5112a7 100644 (file)
--- a/dll/cpl/sysdm/lang/fr-FR.rc
+++ b/dll/cpl/sysdm/lang/fr-FR.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "Go de RAM"
     IDS_TERABYTE "To de RAM"
     IDS_PETABYTE "Po de RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Valeur"
     IDS_NO_DUMP "(Aucun)"

diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc
index a9c6a48..e815aff 100644 (file)
--- a/dll/cpl/sysdm/lang/he-IL.rc
+++ b/dll/cpl/sysdm/lang/he-IL.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB זיכרון פיזי"
     IDS_TERABYTE "TB זיכרון פיזי"
     IDS_PETABYTE "PB זיכרון פיזי"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "משתנה"
     IDS_VALUE "ערך"
     IDS_NO_DUMP "(ללא)"

diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc
index 59de855..591c7ec 100644 (file)
--- a/dll/cpl/sysdm/lang/hu-HU.rc
+++ b/dll/cpl/sysdm/lang/hu-HU.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB of RAM"
     IDS_TERABYTE "TB of RAM"
     IDS_PETABYTE "PB of RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Value"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc
index 0b10792..3e1bb63 100644 (file)
--- a/dll/cpl/sysdm/lang/id-ID.rc
+++ b/dll/cpl/sysdm/lang/id-ID.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variabel"
     IDS_VALUE "Nilai"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc
index d1a71a3..7d2b742 100644 (file)
--- a/dll/cpl/sysdm/lang/it-IT.rc
+++ b/dll/cpl/sysdm/lang/it-IT.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB di RAM"
     IDS_TERABYTE "TB di RAM"
     IDS_PETABYTE "PB di RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variabile"
     IDS_VALUE "Valore"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc
index 080d29c..7bc405e 100644 (file)
--- a/dll/cpl/sysdm/lang/ja-JP.rc
+++ b/dll/cpl/sysdm/lang/ja-JP.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "可変"
     IDS_VALUE "値"
     IDS_NO_DUMP "(なし)"

diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc
index 5e77f27..c70cedc 100644 (file)
--- a/dll/cpl/sysdm/lang/nl-NL.rc
+++ b/dll/cpl/sysdm/lang/nl-NL.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB of RAM"
     IDS_TERABYTE "TB of RAM"
     IDS_PETABYTE "PB of RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Value"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc
index 3eab75b..80ae881 100644 (file)
--- a/dll/cpl/sysdm/lang/no-NO.rc
+++ b/dll/cpl/sysdm/lang/no-NO.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB Systemminne"
     IDS_TERABYTE "TB Systemminne"
     IDS_PETABYTE "PB Systemminne"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variabel"
     IDS_VALUE "Verdi"
     IDS_NO_DUMP "(Ingen)"

diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc
index 722d3f2..eaec406 100644 (file)
--- a/dll/cpl/sysdm/lang/pl-PL.rc
+++ b/dll/cpl/sysdm/lang/pl-PL.rc
@@ -288,6 +288,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Zmienna"
     IDS_VALUE "Wartość"
     IDS_NO_DUMP "(Brak)"

diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc
index 1ffee86..f9160e6 100644 (file)
--- a/dll/cpl/sysdm/lang/ro-RO.rc
+++ b/dll/cpl/sysdm/lang/ro-RO.rc
@@ -288,6 +288,8 @@ BEGIN
     IDS_GIGABYTE "Go de memorie"
     IDS_TERABYTE "To de memorie"
     IDS_PETABYTE "Po de memorie"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variabilă"
     IDS_VALUE "Valoare"
     IDS_NO_DUMP "(Fără fișier de depanare)"

diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc
index addfb91..fc7bfe6 100644 (file)
--- a/dll/cpl/sysdm/lang/ru-RU.rc
+++ b/dll/cpl/sysdm/lang/ru-RU.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "Гб ОЗУ"
     IDS_TERABYTE "Тб ОЗУ"
     IDS_PETABYTE "Пб ОЗУ"
+    IDS_MEGAHERTZ "МГц"
+    IDS_GIGAHERTZ "ГГц"
     IDS_VARIABLE "Переменная"
     IDS_VALUE "Значение"
     IDS_NO_DUMP "(Нет)"

diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc
index 9c89994..fcb33ae 100644 (file)
--- a/dll/cpl/sysdm/lang/sk-SK.rc
+++ b/dll/cpl/sysdm/lang/sk-SK.rc
@@ -287,6 +287,8 @@ BEGIN
     IDS_GIGABYTE "GB pamäte RAM"
     IDS_TERABYTE "TB pamäte RAM"
     IDS_PETABYTE "PB pamäte RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Premenná"
     IDS_VALUE "Hodnota"
     IDS_NO_DUMP "(Žiadne)"

diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc
index 1df47f0..2591773 100644 (file)
--- a/dll/cpl/sysdm/lang/sq-AL.rc
+++ b/dll/cpl/sysdm/lang/sq-AL.rc
@@ -279,6 +279,8 @@ BEGIN
     IDS_GIGABYTE "GB e RAM"
     IDS_TERABYTE "TB e RAM"
     IDS_PETABYTE "PB e RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variablë"
     IDS_VALUE "Vlera"
     IDS_NO_DUMP "(Asnjë)"

diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc
index 7a198c9..0ae2afc 100644 (file)
--- a/dll/cpl/sysdm/lang/sv-SE.rc
+++ b/dll/cpl/sysdm/lang/sv-SE.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB RAM"
     IDS_TERABYTE "TB RAM"
     IDS_PETABYTE "PB RAM"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Variabel"
     IDS_VALUE "Värde"
     IDS_NO_DUMP "(None)"

diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc
index 12a3138..fc38a8c 100644 (file)
--- a/dll/cpl/sysdm/lang/tr-TR.rc
+++ b/dll/cpl/sysdm/lang/tr-TR.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB Bellek"
     IDS_TERABYTE "TB Bellek"
     IDS_PETABYTE "PB Bellek"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "Değişken"
     IDS_VALUE "Değer"
     IDS_NO_DUMP "(Yok)"

diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc
index e358d7d..4051101 100644 (file)
--- a/dll/cpl/sysdm/lang/uk-UA.rc
+++ b/dll/cpl/sysdm/lang/uk-UA.rc
@@ -287,6 +287,8 @@ BEGIN
     IDS_GIGABYTE "Гб ОЗП"
     IDS_TERABYTE "Тб ОЗП"
     IDS_PETABYTE "Пб ОЗП"
+    IDS_MEGAHERTZ "МГц"
+    IDS_GIGAHERTZ "ГГц"
     IDS_VARIABLE "Змінна"
     IDS_VALUE "Значення"
     IDS_NO_DUMP "(Немає)"

diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc
index 6db5d7d..af07acb 100644 (file)
--- a/dll/cpl/sysdm/lang/zh-CN.rc
+++ b/dll/cpl/sysdm/lang/zh-CN.rc
@@ -282,6 +282,8 @@ BEGIN
     IDS_GIGABYTE "GB 内存"
     IDS_TERABYTE "TB 内存"
     IDS_PETABYTE "PB 内存"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "变量"
     IDS_VALUE "值"
     IDS_NO_DUMP "(无)"

diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc
index 5846c98..403d017 100644 (file)
--- a/dll/cpl/sysdm/lang/zh-TW.rc
+++ b/dll/cpl/sysdm/lang/zh-TW.rc
@@ -281,6 +281,8 @@ BEGIN
     IDS_GIGABYTE "GB內存"
     IDS_TERABYTE "TB內存"
     IDS_PETABYTE "PB內存"
+    IDS_MEGAHERTZ "MHz"
+    IDS_GIGAHERTZ "GHz"
     IDS_VARIABLE "變量"
     IDS_VALUE "值"
     IDS_NO_DUMP "(無)"

diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h
index 1535d8b..e999b8c 100644 (file)
--- a/dll/cpl/sysdm/resource.h
+++ b/dll/cpl/sysdm/resource.h
@@ -49,6 +49,9 @@
 #define IDS_HWPROFILE_PROFILE              88
 #define IDS_HWPROFILE_WARNING              89
 
+#define IDS_MEGAHERTZ 90
+#define IDS_GIGAHERTZ 91
+
 /* Propsheet - general */
 #define IDD_PROPPAGEGENERAL  100
 #define IDC_MACHINELINE1     101