https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b65ff2084f2d285be26c0…
commit b65ff2084f2d285be26c0a5c6ae6f3bf6ad25ad0
Author: Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Mon Aug 17 14:18:09 2020 +0300
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Mon Aug 17 14:18:09 2020 +0300
[SYSDM] Localize hardcoded megabyte units
CORE-12485 CORE-16915
---
dll/cpl/sysdm/lang/bg-BG.rc | 1 +
dll/cpl/sysdm/lang/cs-CZ.rc | 1 +
dll/cpl/sysdm/lang/da-DK.rc | 1 +
dll/cpl/sysdm/lang/de-DE.rc | 1 +
dll/cpl/sysdm/lang/el-GR.rc | 1 +
dll/cpl/sysdm/lang/en-US.rc | 1 +
dll/cpl/sysdm/lang/es-ES.rc | 1 +
dll/cpl/sysdm/lang/fr-FR.rc | 1 +
dll/cpl/sysdm/lang/he-IL.rc | 1 +
dll/cpl/sysdm/lang/hu-HU.rc | 1 +
dll/cpl/sysdm/lang/id-ID.rc | 1 +
dll/cpl/sysdm/lang/it-IT.rc | 1 +
dll/cpl/sysdm/lang/ja-JP.rc | 1 +
dll/cpl/sysdm/lang/nl-NL.rc | 1 +
dll/cpl/sysdm/lang/no-NO.rc | 1 +
dll/cpl/sysdm/lang/pl-PL.rc | 1 +
dll/cpl/sysdm/lang/pt-PT.rc | 1 +
dll/cpl/sysdm/lang/ro-RO.rc | 1 +
dll/cpl/sysdm/lang/ru-RU.rc | 1 +
dll/cpl/sysdm/lang/sk-SK.rc | 1 +
dll/cpl/sysdm/lang/sq-AL.rc | 1 +
dll/cpl/sysdm/lang/sv-SE.rc | 1 +
dll/cpl/sysdm/lang/tr-TR.rc | 1 +
dll/cpl/sysdm/lang/uk-UA.rc | 1 +
dll/cpl/sysdm/lang/zh-CN.rc | 1 +
dll/cpl/sysdm/lang/zh-TW.rc | 1 +
dll/cpl/sysdm/resource.h | 7 ++++---
dll/cpl/sysdm/virtmem.c | 18 ++++++++++++------
28 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc
index 560a7bc764b..ee8647e713b 100644
--- a/dll/cpl/sysdm/lang/bg-BG.rc
+++ b/dll/cpl/sysdm/lang/bg-BG.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на страниращия файл."
IDS_WARNINITIALRANGE "Началният размер на страниращия файл не трябва да е по-малък от 2 МБ и не трябва да надхвърля свободното пространство на избраното устройство."
IDS_WARNMAXIMUMRANGE "Върховият размер на страниращия файл не трябва да е по-малък от началния и не трябва да надвишава свободното пространство на избраното устройство"
+ IDS_PAGEFILE_MB "%u МБ"
IDS_PAGEFILE_NONE "Няма"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc
index 71e6775bab0..a87f40e9c72 100644
--- a/dll/cpl/sysdm/lang/cs-CZ.rc
+++ b/dll/cpl/sysdm/lang/cs-CZ.rc
@@ -340,6 +340,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost stránkovacího souboru."
IDS_WARNINITIALRANGE "Počáteční velikost stránkovacího souboru nesmí být menší než 2 MB a nesmí překročit množství volného místa na zvolené diskové jednotce."
IDS_WARNMAXIMUMRANGE "Maximální velikost stránkovacího souboru nesmí být menší než velikost počáteční, nesmí být větší než 4095 MB a nesmí překročit množství volného místa na zvolené diskové jednotce."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Není"
IDS_PAGEFILE_SYSTEM "Spravováno systémem"
IDS_INFOREBOOT "Změny se projeví po restartování počítače."
diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc
index 264b3190333..0a9d6f3c862 100644
--- a/dll/cpl/sysdm/lang/da-DK.rc
+++ b/dll/cpl/sysdm/lang/da-DK.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc
index cd6bac514ac..b6800123402 100644
--- a/dll/cpl/sysdm/lang/de-DE.rc
+++ b/dll/cpl/sysdm/lang/de-DE.rc
@@ -344,6 +344,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an."
IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht kleiner als 2 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten."
IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht kleiner als die Anfangsgröße sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk nicht überschreiten."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Keine"
IDS_PAGEFILE_SYSTEM "Systemverwaltet"
IDS_INFOREBOOT "Sie müssen den Computer neu starten, damit die Änderung wirksam wird."
diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc
index f3e649d86ef..1f884f97574 100644
--- a/dll/cpl/sysdm/lang/el-GR.rc
+++ b/dll/cpl/sysdm/lang/el-GR.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Κανένα"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc
index f929f16d32f..1c041539b96 100644
--- a/dll/cpl/sysdm/lang/en-US.rc
+++ b/dll/cpl/sysdm/lang/en-US.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc
index 1abb649cd7a..2f667bbb2d8 100644
--- a/dll/cpl/sysdm/lang/es-ES.rc
+++ b/dll/cpl/sysdm/lang/es-ES.rc
@@ -337,6 +337,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Introduzca el tamaño máximo del archivo de paginación."
IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser inferior a 2 MB y no puede exceder el espacio disponible en la unidad seleccionada."
IDS_WARNMAXIMUMRANGE "El tamaño máximo del archivo de paginación no puede ser inferior al tamaño inicial y no puede exceder el espacio disponible en la unidad seleccionada."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Ninguno"
IDS_PAGEFILE_SYSTEM "Administrado por el sistema"
IDS_INFOREBOOT "Es necesario reiniciar el equipo para que se apliquen los cambios."
diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc
index c7633c9efd9..825bd0c87a7 100644
--- a/dll/cpl/sysdm/lang/fr-FR.rc
+++ b/dll/cpl/sysdm/lang/fr-FR.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Entrez une valeur numérique pour la taille maximale du fichier d'échange."
IDS_WARNINITIALRANGE "La taille initiale du fichier d'échange doit être comprise entre 2 Mo et 4096 Mo, et ne peut pas excéder la quantité d'espace libre sur le lecteur que vous avez sélectionné."
IDS_WARNMAXIMUMRANGE "Entrez une valeur pour la taille maximale du fichier d'échange qui soit supérieure ou égale à la taille initiale du fichier d'échange, et inférieure à 4096 Mo."
+ IDS_PAGEFILE_MB "%u Mo"
IDS_PAGEFILE_NONE "Aucun"
IDS_PAGEFILE_SYSTEM "Géré par le système"
IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements."
diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc
index c5713c6f661..ff7c6c74f18 100644
--- a/dll/cpl/sysdm/lang/he-IL.rc
+++ b/dll/cpl/sysdm/lang/he-IL.rc
@@ -337,6 +337,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "ללא"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc
index 1d33f3d3d25..75cb1f0c297 100644
--- a/dll/cpl/sysdm/lang/hu-HU.rc
+++ b/dll/cpl/sysdm/lang/hu-HU.rc
@@ -337,6 +337,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc
index 9d7ff603d6d..d230820376a 100644
--- a/dll/cpl/sysdm/lang/id-ID.rc
+++ b/dll/cpl/sysdm/lang/id-ID.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Masukkan nilai numerik untuk ukuran maksimum halaman berkas."
IDS_WARNINITIALRANGE "Ukuran awal halaman berkas tidak boleh lebih kecil dari 2 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih."
IDS_WARNMAXIMUMRANGE "Ukuran maksimum halaman berkas tidak boleh lebih kecil dari ukuran awal, maupun lebih besar dari 4095 MB dan tidak boleh melebihi ruang yang tersedia pada drive yang dipilih."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Tidak ada"
IDS_PAGEFILE_SYSTEM "Diatur Sistem"
IDS_INFOREBOOT "Anda harus memulai ulang komputer untuk menerapkan perubahan."
diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc
index 1cc67b253b2..a3b9b67cb48 100644
--- a/dll/cpl/sysdm/lang/it-IT.rc
+++ b/dll/cpl/sysdm/lang/it-IT.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging."
IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere inferiore a 2 MB e non può superare lo spazio disponibile nell'unità selezionata."
IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non può essere inferiore a quella iniziale e non può superare lo spazio disponibile nell'unità selezionata."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc
index 5ecdf7898b4..3999c837a49 100644
--- a/dll/cpl/sysdm/lang/ja-JP.rc
+++ b/dll/cpl/sysdm/lang/ja-JP.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "ページングファイルの最大サイズの数値を入力して下さい。"
IDS_WARNINITIALRANGE "ページングファイルの初期サイズは2 MB以上でなければなりません。また、選択中のドライブの利用可能なサイズを超えてはいけません。"
IDS_WARNMAXIMUMRANGE "ページングファイルの最大サイズは初期サイズ以上でなければなりません。また、4095 MB か選択中のドライブの利用可能なサイズを超えてはいけません。"
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "なし"
IDS_PAGEFILE_SYSTEM "システム管理"
IDS_INFOREBOOT "変更を適用するには、コンピュータを再起動する必要があります。"
diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc
index c8be7173e24..1bdd57389cd 100644
--- a/dll/cpl/sysdm/lang/nl-NL.rc
+++ b/dll/cpl/sysdm/lang/nl-NL.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc
index 0c28efb2a68..060461ba3d6 100644
--- a/dll/cpl/sysdm/lang/no-NO.rc
+++ b/dll/cpl/sysdm/lang/no-NO.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Ingen"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc
index 8fcd977489b..454e119055f 100644
--- a/dll/cpl/sysdm/lang/pl-PL.rc
+++ b/dll/cpl/sysdm/lang/pl-PL.rc
@@ -344,6 +344,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku stronicowania."
IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 2 MB i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie."
IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie może być mniejszy niż jego rozmiar początkowy i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Brak"
IDS_PAGEFILE_SYSTEM "Kontrolowany przez system"
IDS_INFOREBOOT "Musisz ponownie uruchomić komputer, aby zastosować zmiany."
diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc
index b00b99cb104..10b4bc218c1 100644
--- a/dll/cpl/sysdm/lang/pt-PT.rc
+++ b/dll/cpl/sysdm/lang/pt-PT.rc
@@ -339,6 +339,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Digite um valor numérico para o tamanho máximo do arquivo de paginação."
IDS_WARNINITIALRANGE "O tamanho inicial do arquivo de paginação não deve ser menor que 2 MB e não deve exceder o espaço disponível na unidade seleccionada."
IDS_WARNMAXIMUMRANGE "O tamanho máximo do arquivo de paginação não deve ser menor que o tamanho inicial, não deve ser maior que 4095 MB e não deve exceder o espaço disponível na unidade seleccionada."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Nenhum"
IDS_PAGEFILE_SYSTEM "Sistema gerenciado"
IDS_INFOREBOOT "Precisa reiniciar o computador para aplicar as alterações."
diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc
index 7eed8f9b489..3b54123c373 100644
--- a/dll/cpl/sysdm/lang/ro-RO.rc
+++ b/dll/cpl/sysdm/lang/ro-RO.rc
@@ -344,6 +344,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă a fișierului de paginare."
IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie să fie încadrată între 2 Mo și spațiul liber disponibil al unității selectate."
IDS_WARNMAXIMUMRANGE "Dimensiunea maximă a fișierului de paginare trebuie să fie încadrată între dimensiunea inițială și spațiul liber disponibil al unității selectate."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Nespecificat"
IDS_PAGEFILE_SYSTEM "Gestionat de sistem"
IDS_INFOREBOOT "Pentru aplicarea modificărilor este necesară repornirea calculatorului."
diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc
index 403e6f5c428..e317bab9af2 100644
--- a/dll/cpl/sysdm/lang/ru-RU.rc
+++ b/dll/cpl/sysdm/lang/ru-RU.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки."
IDS_WARNINITIALRANGE "Начальный размер файла подкачки должен быть не меньше, чем 2 МБ и не должен превышать свободного места на выбранном диске."
IDS_WARNMAXIMUMRANGE "Максимальный размер файла подкачки должен быть не меньше, чем начальный размер, который не должен превышать свободного места на выбранном диске."
+ IDS_PAGEFILE_MB "%u МБ"
IDS_PAGEFILE_NONE "Нет"
IDS_PAGEFILE_SYSTEM "По выбору системы"
IDS_INFOREBOOT "Необходимо перезагрузить компьютер для применения изменений."
diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc
index 335056d5d90..b4d0639832c 100644
--- a/dll/cpl/sysdm/lang/sk-SK.rc
+++ b/dll/cpl/sysdm/lang/sk-SK.rc
@@ -343,6 +343,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Žiadne"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc
index 3d1f1ad9ba4..cee888f41c4 100644
--- a/dll/cpl/sysdm/lang/sq-AL.rc
+++ b/dll/cpl/sysdm/lang/sq-AL.rc
@@ -335,6 +335,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e faqeve të dokumentave."
IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të jetë më e vogël se 2 MB dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur."
IDS_WARNMAXIMUMRANGE "Madhësia maksimale e faqes së dokumenit nuk duhet të jetë më e vogël se madhësia e saj fillestare dhe nuk duhet të kalojë hapësirën në dispozicion në driver-in e përzgjedhur."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Asnjë"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc
index f868a96473e..048fc3a931e 100644
--- a/dll/cpl/sysdm/lang/sv-SE.rc
+++ b/dll/cpl/sysdm/lang/sv-SE.rc
@@ -337,6 +337,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "None"
IDS_PAGEFILE_SYSTEM "System Managed"
IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc
index 99e36c9101b..0f578c618fc 100644
--- a/dll/cpl/sysdm/lang/tr-TR.rc
+++ b/dll/cpl/sysdm/lang/tr-TR.rc
@@ -337,6 +337,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık değer giriniz."
IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 2 MB'tan küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır."
IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün en çok büyüklüğü, kendisinin başlangıç büyüklüğünden küçük olmamalıdır ve seçili sürücüde var olan boşluğu aşmamalıdır."
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "Yok"
IDS_PAGEFILE_SYSTEM "Dizge Yönetimli"
IDS_INFOREBOOT "Değişiklikleri uygulamak için bilgisayarı yeniden başlatmalısınız."
diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc
index aea6d8a47a6..bc2a408eb81 100644
--- a/dll/cpl/sysdm/lang/uk-UA.rc
+++ b/dll/cpl/sysdm/lang/uk-UA.rc
@@ -343,6 +343,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "Введіть числове значення для максимального розміру файлу довантаження."
IDS_WARNINITIALRANGE "Початковий розмір файлу довантаження не повинен бути меншим 2 Мб і не повинен перевищувати об'єм вільного місця на обраному диску."
IDS_WARNMAXIMUMRANGE "Максимальний розмір файлу довантаження не повинен бути меншим від початкового та не повинен перевищувати об'єм вільного місця на обраному диску."
+ IDS_PAGEFILE_MB "%u МБ"
IDS_PAGEFILE_NONE "Немає"
IDS_PAGEFILE_SYSTEM "За вибором системи"
IDS_INFOREBOOT "Необхідно перезавантажити комп'ютер для застосування нових параметрів."
diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc
index d043d816634..3ecff0f5636 100644
--- a/dll/cpl/sysdm/lang/zh-CN.rc
+++ b/dll/cpl/sysdm/lang/zh-CN.rc
@@ -338,6 +338,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。"
IDS_WARNINITIALRANGE "分页文件的初始大小不得小于 2 MB,并且不得超过所选磁盘上的可用空间。"
IDS_WARNMAXIMUMRANGE "分页文件的最大大小不能小于其初始大小和不能超过所选磁盘上的可用空间。"
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "无"
IDS_PAGEFILE_SYSTEM "系统已托管"
IDS_INFOREBOOT "您必须重新启动计算机,才能应用更改。"
diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc
index 7d7fa1cb762..abe5c107d67 100644
--- a/dll/cpl/sysdm/lang/zh-TW.rc
+++ b/dll/cpl/sysdm/lang/zh-TW.rc
@@ -338,6 +338,7 @@ BEGIN
IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。"
IDS_WARNINITIALRANGE "分頁文件的初始大小不得小於 2 MB,並且不得超過所選磁碟上的可用空間。"
IDS_WARNMAXIMUMRANGE "分頁文件的最大大小不能小於其初始大小和不能超過所選磁碟上的可用空間。"
+ IDS_PAGEFILE_MB "%u MB"
IDS_PAGEFILE_NONE "無"
IDS_PAGEFILE_SYSTEM "系統已管理"
IDS_INFOREBOOT "您必須重新啓動電腦,才能套用更改。"
diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h
index 93d204416b5..94744806b0a 100644
--- a/dll/cpl/sysdm/resource.h
+++ b/dll/cpl/sysdm/resource.h
@@ -47,9 +47,10 @@
#define IDS_WARNMAXIMUMSIZE 102
#define IDS_WARNINITIALRANGE 103
#define IDS_WARNMAXIMUMRANGE 104
-#define IDS_PAGEFILE_NONE 105
-#define IDS_PAGEFILE_SYSTEM 106
-#define IDS_INFOREBOOT 107
+#define IDS_PAGEFILE_MB 105
+#define IDS_PAGEFILE_NONE 106
+#define IDS_PAGEFILE_SYSTEM 107
+#define IDS_INFOREBOOT 108
#define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 120
#define IDS_HWPROFILE_CONFIRM_DELETE 121
diff --git a/dll/cpl/sysdm/virtmem.c b/dll/cpl/sysdm/virtmem.c
index 4651fab4b88..798223c8453 100644
--- a/dll/cpl/sysdm/virtmem.c
+++ b/dll/cpl/sysdm/virtmem.c
@@ -508,7 +508,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
ULARGE_INTEGER FreeDiskSpace;
UINT i, FreeMemMb, RecoMemMb, PageFileSizeMb;
INT Index;
- TCHAR szText[MAX_PATH];
+ TCHAR szText[MAX_PATH], szMegabytes[8];
WIN32_FIND_DATAW fdata = {0};
HANDLE hFind;
ULARGE_INTEGER pfSize;
@@ -520,6 +520,11 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
0);
if (Index >= 0 && Index < pVirtMem->Count)
{
+ LoadString(hApplet,
+ IDS_PAGEFILE_MB,
+ szMegabytes,
+ ARRAYSIZE(szMegabytes));
+
/* Set drive letter */
SetDlgItemText(hwndDlg, IDC_DRIVE,
pVirtMem->Pagefile[Index].szDrive);
@@ -529,7 +534,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
NULL, NULL, &FreeDiskSpace))
{
pVirtMem->Pagefile[Index].FreeSize = (UINT)(FreeDiskSpace.QuadPart / (1024 * 1024));
- _stprintf(szBuffer, _T("%u MB"), pVirtMem->Pagefile[Index].FreeSize);
+ _stprintf(szBuffer, szMegabytes, pVirtMem->Pagefile[Index].FreeSize);
SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer);
}
@@ -576,8 +581,9 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
BST_CHECKED);
}
- /* Set minimum pagefile size */
- SetDlgItemText(hwndDlg, IDC_MINIMUM, _T("2 MB"));
+ /* Set minimum pagefile size (2 MB) */
+ _stprintf(szBuffer, szMegabytes, 2);
+ SetDlgItemText(hwndDlg, IDC_MINIMUM, szBuffer);
/* Set recommended pagefile size */
MemoryStatus.dwLength = sizeof(MEMORYSTATUSEX);
@@ -587,7 +593,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
RecoMemMb = FreeMemMb + (FreeMemMb / 2); /* The recommended VM size is 150% of free memory. */
if (RecoMemMb > 4096)
RecoMemMb = 4096;
- _stprintf(szBuffer, _T("%u MB"), RecoMemMb);
+ _stprintf(szBuffer, szMegabytes, RecoMemMb);
SetDlgItemText(hwndDlg, IDC_RECOMMENDED, szBuffer);
}
@@ -614,7 +620,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem)
}
}
- _stprintf(szBuffer, _T("%u MB"), PageFileSizeMb);
+ _stprintf(szBuffer, szMegabytes, PageFileSizeMb);
SetDlgItemText(hwndDlg, IDC_CURRENT, szBuffer);
}
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=887764e6075fdde7fb81d…
commit 887764e6075fdde7fb81d2a54d5255164c046511
Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com>
AuthorDate: Thu May 21 20:52:13 2020 +0100
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sun Aug 16 18:42:12 2020 +0300
[COMCTL32] Fix issue on showing current mouse pointer (#2829)
GetIconInfo() fill info.hbmColor with NULL HBITMAP handle on black/white bitmaps.
CORE-17062
---
dll/win32/comctl32/static.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/dll/win32/comctl32/static.c b/dll/win32/comctl32/static.c
index f136f2cc79c..b30f0532f3a 100644
--- a/dll/win32/comctl32/static.c
+++ b/dll/win32/comctl32/static.c
@@ -94,11 +94,24 @@ static BOOL get_icon_size( HICON handle, SIZE *size )
if (!GetIconInfo(handle, &info))
return FALSE;
+#ifdef __REACTOS__
+ ret = GetObjectW(info.hbmMask, sizeof(bmp), &bmp);
+#else
ret = GetObjectW(info.hbmColor, sizeof(bmp), &bmp);
+#endif
if (ret)
{
size->cx = bmp.bmWidth;
size->cy = bmp.bmHeight;
+#ifdef __REACTOS__
+ /*
+ If this structure defines a black and white icon, this bitmask is formatted
+ so that the upper half is the icon AND bitmask and the lower half is
+ the icon XOR bitmask.
+ */
+ if (!info.hbmColor)
+ size->cy /= 2;
+#endif
}
DeleteObject(info.hbmMask);