From 4ad16fa60c448388235680209753f900e8e1e74c Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 19 Nov 2011 15:10:13 +0100 Subject: [PATCH] dxdiagn: Fix a string resource so its format placeholders can be reordered. --- dlls/dxdiagn/dxdiagn.rc | 2 +- dlls/dxdiagn/provider.c | 7 ++++++- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 3 ++- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 3 ++- po/el.po | 2 +- po/en.po | 2 +- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 3 ++- po/he.po | 3 ++- po/hi.po | 2 +- po/hu.po | 2 +- po/it.po | 3 ++- po/ja.po | 3 ++- po/ko.po | 3 ++- po/lt.po | 3 ++- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 3 ++- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 3 ++- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS@cyrillic.po | 2 +- po/sr_RS@latin.po | 2 +- po/sv.po | 3 ++- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 3 ++- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 47 files changed, 65 insertions(+), 48 deletions(-) diff --git a/dlls/dxdiagn/dxdiagn.rc b/dlls/dxdiagn/dxdiagn.rc index e25b3c585e2..b37d3147e59 100644 --- a/dlls/dxdiagn/dxdiagn.rc +++ b/dlls/dxdiagn/dxdiagn.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT 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 a881ea70b00..bb4ce08bd89 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -598,6 +598,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) 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 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) 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 6a2f699e8b4..4a12d527923 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1989,7 +1989,7 @@ msgid "Regional Setting" 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 5c0fec64125..21059f0f1f7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2005,7 +2005,7 @@ msgid "Regional Setting" 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 21d96039190..4b4e2c55f8c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2040,7 +2040,8 @@ msgid "Regional Setting" 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 5c204dcb079..b695f05e50e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2034,7 +2034,7 @@ msgid "Regional Setting" 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 edd0abee6ec..02a84d206b8 100644 --- a/po/da.po +++ b/po/da.po @@ -2038,7 +2038,7 @@ msgid "Regional Setting" 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 63a4fb90eda..f3a86115955 100644 --- a/po/de.po +++ b/po/de.po @@ -2032,7 +2032,8 @@ msgid "Regional Setting" 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 a7d921dd2d9..718ddc78554 100644 --- a/po/el.po +++ b/po/el.po @@ -1983,7 +1983,7 @@ msgid "Regional Setting" 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 2e13f9dcd69..f57361b514f 100644 --- a/po/en.po +++ b/po/en.po @@ -1966,7 +1966,7 @@ msgid "Regional Setting" 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 db0987d77af..d1e2cade48f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -2030,8 +2030,8 @@ msgid "Regional Setting" 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 d5c4618486c..7350a4ab45d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2015,7 +2015,7 @@ msgid "Regional Setting" 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 69b2a2ca679..79d12b43b0e 100644 --- a/po/es.po +++ b/po/es.po @@ -2049,7 +2049,7 @@ msgid "Regional Setting" 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 310132892d1..7945ea20fbe 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1989,7 +1989,7 @@ msgid "Regional Setting" 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 9121e1d576e..1fcddec7bfc 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2007,7 +2007,7 @@ msgid "Regional Setting" 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 20297c58c92..b9262bb0a3c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2041,7 +2041,8 @@ msgid "Regional Setting" 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 28af50800c0..e1a2c4da6f9 100644 --- a/po/he.po +++ b/po/he.po @@ -2002,7 +2002,8 @@ msgid "Regional Setting" 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 91eb8c511e9..3121de31ad4 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1968,7 +1968,7 @@ msgid "Regional Setting" 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 1261e6c6c9e..1eb289f063d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2076,7 +2076,7 @@ msgid "Regional Setting" 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 05ccc283a8c..200b8b156ba 100644 --- a/po/it.po +++ b/po/it.po @@ -2038,7 +2038,8 @@ msgid "Regional Setting" 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 a4049a45acd..aa5ce784514 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2027,7 +2027,8 @@ msgid "Regional Setting" 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 f362104348e..53dead1e877 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2028,7 +2028,8 @@ msgid "Regional Setting" 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 dc3794f1b4e..df3ae76569a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2037,7 +2037,8 @@ msgid "Regional Setting" 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 0cf8b18e929..ed92bd195cd 100644 --- a/po/ml.po +++ b/po/ml.po @@ -1968,7 +1968,7 @@ msgid "Regional Setting" 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 727d8fd458f..fc3421fda74 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2137,7 +2137,7 @@ msgid "Regional Setting" 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 f622a613d09..26ead81553a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2054,7 +2054,7 @@ msgid "Regional Setting" 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 753b949d31f..1617f847844 100644 --- a/po/or.po +++ b/po/or.po @@ -1968,7 +1968,7 @@ msgid "Regional Setting" 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 084cf96e633..e44b975ee05 100644 --- a/po/pa.po +++ b/po/pa.po @@ -1968,7 +1968,7 @@ msgid "Regional Setting" 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 69341975cea..39bdbe0ee06 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2037,7 +2037,8 @@ msgid "Regional Setting" 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 5872b509a75..d09ac092c12 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2136,7 +2136,7 @@ msgid "Regional Setting" 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 4340c53ecba..7dd6625ebdc 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2150,7 +2150,7 @@ msgid "Regional Setting" 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 07c1c66d758..50334335916 100644 --- a/po/rm.po +++ b/po/rm.po @@ -1976,7 +1976,7 @@ msgid "Regional Setting" 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 cdd13527b29..3964f26ccea 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2195,7 +2195,7 @@ msgid "Regional Setting" 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 cb0cb9581ea..db176daae6b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2030,7 +2030,8 @@ msgid "Regional Setting" 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 1bb757e141c..9847072b0da 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1980,7 +1980,7 @@ msgid "Regional Setting" 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 427f0291d5a..fa225cde5b7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2048,7 +2048,7 @@ msgid "Regional Setting" 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 4d60a0a38f1..d33da611723 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -2023,7 +2023,7 @@ msgid "Regional Setting" 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 5eb84e1478e..dc4b9ff7bf9 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -2044,7 +2044,7 @@ msgid "Regional Setting" 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 08bc565c8c7..5237c79c50c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2044,7 +2044,8 @@ msgid "Regional Setting" 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 a73c635816d..85869407864 100644 --- a/po/te.po +++ b/po/te.po @@ -1968,7 +1968,7 @@ msgid "Regional Setting" 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 abdb49b8863..e347c91afd0 100644 --- a/po/th.po +++ b/po/th.po @@ -1985,7 +1985,7 @@ msgid "Regional Setting" 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 bbc7787ca11..6986ce8ec7e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2019,7 +2019,7 @@ msgid "Regional Setting" 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 0322e04bcd1..51b1f592c74 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2038,7 +2038,8 @@ msgid "Regional Setting" 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 f608fc5f3ec..207782033c4 100644 --- a/po/wa.po +++ b/po/wa.po @@ -1979,7 +1979,7 @@ msgid "Regional Setting" 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 6d39f23e3bc..91c664f0551 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -1961,7 +1961,7 @@ msgid "Regional Setting" 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 6fee98c3102..7ff0b3091ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2020,7 +2020,7 @@ msgid "Regional Setting" 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 2ac3327753e..9f99f075f01 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2024,7 +2024,7 @@ msgid "Regional Setting" msgstr "預設設定" #: dxdiagn.rc:26 -msgid "%uMB used, %uMB available" +msgid "%1!u!MB used, %2!u!MB available" msgstr "" #: gdi32.rc:25