dxdiagn: Fix a string resource so its format placeholders can be reordered.
diff --git a/dlls/dxdiagn/dxdiagn.rc b/dlls/dxdiagn/dxdiagn.rc
index e25b3c5..b37d314 100644
--- a/dlls/dxdiagn/dxdiagn.rc
+++ b/dlls/dxdiagn/dxdiagn.rc
@@ -23,7 +23,7 @@
STRINGTABLE
{
IDS_REGIONAL_SETTING "Regional Setting"
- IDS_PAGE_FILE_FORMAT "%uMB used, %uMB available"
+ IDS_PAGE_FILE_FORMAT "%1!u!MB used, %2!u!MB available"
}
#define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8"
diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index a881ea7..bb4ce08 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -598,6 +598,7 @@
OSVERSIONINFOW info;
DWORD count, usedpage_mb, availpage_mb;
WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200], localized_pagefile_fmt[200];
+ DWORD_PTR args[2];
hr = add_ui4_property(node, dwDirectXVersionMajor, 9);
if (FAILED(hr))
@@ -678,7 +679,11 @@
usedpage_mb = (DWORD)((msex.ullTotalPageFile - msex.ullAvailPageFile) / (1024 * 1024));
availpage_mb = (DWORD)(msex.ullAvailPageFile / (1024 * 1024));
LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, sizeof(localized_pagefile_fmt)/sizeof(WCHAR));
- snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), localized_pagefile_fmt, usedpage_mb, availpage_mb);
+ args[0] = usedpage_mb;
+ args[1] = availpage_mb;
+ FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ localized_pagefile_fmt, 0, 0, print_buf,
+ sizeof(print_buf)/sizeof(*print_buf), (__ms_va_list*)args);
hr = add_bstr_property(node, szPageFileLocalized, print_buf);
if (FAILED(hr))
diff --git a/po/ar.po b/po/ar.po
index 6a2f699..4a12d52 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1989,7 +1989,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/bg.po b/po/bg.po
index 5c0fec6..21059f0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2005,7 +2005,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/ca.po b/po/ca.po
index 21d9603..4b4e2c5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2040,7 +2040,8 @@
msgstr "Ajustament Regional"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB usat, %uMB disponible"
#: gdi32.rc:25
diff --git a/po/cs.po b/po/cs.po
index 5c204dc..b695f05 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2034,7 +2034,7 @@
msgstr "Standardní nastavení"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/da.po b/po/da.po
index edd0abe..02a84d2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2038,7 +2038,7 @@
msgstr "Standard indstillinger"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/de.po b/po/de.po
index 63a4fb9..f3a8611 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2032,7 +2032,8 @@
msgstr "Regionale Einstellungen"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB benutzt, %uMB verfügbar"
#: gdi32.rc:25
diff --git a/po/el.po b/po/el.po
index a7d921d..718ddc7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1983,7 +1983,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/en.po b/po/en.po
index 2e13f9d..f57361b 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1966,7 +1966,7 @@
msgstr "Regional Setting"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/en_US.po b/po/en_US.po
index db0987d..d1e2cad 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -2030,8 +2030,8 @@
msgstr "Regional Setting"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
-msgstr "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
+msgstr "%1!u!MB used, %2!u!MB available"
#: gdi32.rc:25
msgid "Western"
diff --git a/po/eo.po b/po/eo.po
index d5c4618..7350a4a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2015,7 +2015,7 @@
msgstr "Defaýltaj Agordoj"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/es.po b/po/es.po
index 69b2a2c..79d12b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2049,7 +2049,7 @@
msgstr "Configuración por defecto"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/fa.po b/po/fa.po
index 3101328..7945ea2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1989,7 +1989,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/fi.po b/po/fi.po
index 9121e1d..1fcddec 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2007,7 +2007,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/fr.po b/po/fr.po
index 20297c5..b9262bb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2041,7 +2041,8 @@
msgstr "Paramètres régionaux"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%u MB utilisés, %u MB disponibles"
#: gdi32.rc:25
diff --git a/po/he.po b/po/he.po
index 28af508..e1a2c4d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2002,7 +2002,8 @@
msgstr "הגדרות אזוריות"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%u מ״ב בשימוש, %u מ״ב זמינים"
#: gdi32.rc:25
diff --git a/po/hi.po b/po/hi.po
index 91eb8c5..3121de3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1968,7 +1968,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/hu.po b/po/hu.po
index 1261e6c..1eb289f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2076,7 +2076,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/it.po b/po/it.po
index 05ccc28..200b8b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2038,7 +2038,8 @@
msgstr "Impostazioni regionali"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB usati, %uMB disponibili"
#: gdi32.rc:25
diff --git a/po/ja.po b/po/ja.po
index a4049a4..aa5ce78 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2027,7 +2027,8 @@
msgstr "地域の設定"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%u MB 使用中、%u MB 使用可能"
#: gdi32.rc:25
diff --git a/po/ko.po b/po/ko.po
index f362104..53dead1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2028,7 +2028,8 @@
msgstr "지역 설정"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB 사용됨, %uMB 사용 가능함"
#: gdi32.rc:25
diff --git a/po/lt.po b/po/lt.po
index dc3794f..df3ae76 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2037,7 +2037,8 @@
msgstr "Regiono nuostatos"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%u MB sunaudota, %u MB laisva"
#: gdi32.rc:25
diff --git a/po/ml.po b/po/ml.po
index 0cf8b18..ed92bd1 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1968,7 +1968,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 727d8fd..fc3421f 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -2137,7 +2137,7 @@
msgstr "Globale innstillinger"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/nl.po b/po/nl.po
index f622a61..26ead81 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2054,7 +2054,7 @@
msgstr "Standaardinstellingen"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/or.po b/po/or.po
index 753b949..1617f84 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1968,7 +1968,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/pa.po b/po/pa.po
index 084cf96..e44b975 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1968,7 +1968,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/pl.po b/po/pl.po
index 6934197..39bdbe0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2037,7 +2037,8 @@
msgstr "Ustawienia regionalne"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB użytych, %uMB dostępnych"
#: gdi32.rc:25
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5872b50..d09ac09 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2136,7 +2136,7 @@
msgstr "Configurações Padrão"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 4340c53..7dd6625 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -2150,7 +2150,7 @@
msgstr "Definições Predefinidas"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/rm.po b/po/rm.po
index 07c1c66..5033433 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -1976,7 +1976,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/ro.po b/po/ro.po
index cdd1352..3964f26 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2195,7 +2195,7 @@
msgstr "Setări implicite"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/ru.po b/po/ru.po
index cb0cb95..db176da 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2030,7 +2030,8 @@
msgstr "Региональные настройки"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uМБ используется, %uМБ доступно"
#: gdi32.rc:25
diff --git a/po/sk.po b/po/sk.po
index 1bb757e..9847072 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1980,7 +1980,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/sl.po b/po/sl.po
index 427f029..fa225cd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2048,7 +2048,7 @@
msgstr "Privzete nastavitve"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 4d60a0a..d33da61 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -2023,7 +2023,7 @@
msgstr "Поставке интернета"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 5eb84e1..dc4b9ff 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -2044,7 +2044,7 @@
msgstr "Osnovno podešavanje"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/sv.po b/po/sv.po
index 08bc565..5237c79 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2044,7 +2044,8 @@
msgstr "Regional inställning"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uMB använda, %uMB tillgängliga"
#: gdi32.rc:25
diff --git a/po/te.po b/po/te.po
index a73c635..8586940 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1968,7 +1968,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/th.po b/po/th.po
index abdb49b..e347c91 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1985,7 +1985,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/tr.po b/po/tr.po
index bbc7787..6986ce8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2019,7 +2019,7 @@
msgstr "Öntanımlı Ayarlar"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/uk.po b/po/uk.po
index 0322e04..51b1f59 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2038,7 +2038,8 @@
msgstr "Регіональні Налаштування"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+#, fuzzy
+msgid "%1!u!MB used, %2!u!MB available"
msgstr "%uМБ використано, %uМБ доступно"
#: gdi32.rc:25
diff --git a/po/wa.po b/po/wa.po
index f608fc5..2077820 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -1979,7 +1979,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/wine.pot b/po/wine.pot
index 6d39f23..91c664f 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -1961,7 +1961,7 @@
msgstr ""
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6fee98c..7ff0b30 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2020,7 +2020,7 @@
msgstr "默认设置"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2ac3327..9f99f07 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2024,7 +2024,7 @@
msgstr "預設設定"
#: dxdiagn.rc:26
-msgid "%uMB used, %uMB available"
+msgid "%1!u!MB used, %2!u!MB available"
msgstr ""
#: gdi32.rc:25
