ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dxdiagn: Fix a string resource so its format placeholders can be reordered.

This commit is contained in:
Francois Gouget 2011-11-19 15:10:13 +01:00 committed by Alexandre Julliard
parent 750463f21c
commit 4ad16fa60c
47 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dxdiagn/dxdiagn.rc
View File

@ -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"

7
dlls/dxdiagn/provider.c
View File

@ -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))

2
po/ar.po
View File

@ -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

2
po/bg.po
View File

@ -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

3
po/ca.po
View File

@ -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

2
po/cs.po
View File

@ -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

2
po/da.po
View File

@ -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

3
po/de.po
View File

@ -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

2
po/el.po
View File

@ -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

2
po/en.po
View File

@ -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

4
po/en_US.po
View File

@ -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"

2
po/eo.po
View File

@ -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

2
po/es.po
View File

@ -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

2
po/fa.po
View File

@ -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

2
po/fi.po
View File

@ -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

3
po/fr.po
View File

@ -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

3
po/he.po
View File

@ -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

2
po/hi.po
View File

@ -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

2
po/hu.po
View File

@ -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

3
po/it.po
View File

@ -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

3
po/ja.po
View File

@ -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

3
po/ko.po
View File

@ -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

3
po/lt.po
View File

@ -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

2
po/ml.po
View File

@ -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

2
po/nb_NO.po
View File

@ -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

2
po/nl.po
View File

@ -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

2
po/or.po
View File

@ -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

2
po/pa.po
View File

@ -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

3
po/pl.po
View File

@ -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

2
po/pt_BR.po
View File

@ -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

2
po/pt_PT.po
View File

@ -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

2
po/rm.po
View File

@ -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

2
po/ro.po
View File

@ -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

3
po/ru.po
View File

@ -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

2
po/sk.po
View File

@ -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

2
po/sl.po
View File

@ -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

2
po/sr_RS@cyrillic.po
View File

@ -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

2
po/sr_RS@latin.po
View File

@ -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

3
po/sv.po
View File

@ -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

2
po/te.po
View File

@ -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

2
po/th.po
View File

@ -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

2
po/tr.po
View File

@ -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

3
po/uk.po
View File

@ -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

2
po/wa.po
View File

@ -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

2
po/wine.pot
View File

@ -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

2
po/zh_CN.po
View File

@ -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

2
po/zh_TW.po
View File

@ -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