oleview: Fix a string resource so its format placeholders can be reordered.
diff --git a/po/ar.po b/po/ar.po index f844166..daee023 100644 --- a/po/ar.po +++ b/po/ar.po
@@ -9109,7 +9109,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/bg.po b/po/bg.po index 84cad43..7157400 100644 --- a/po/bg.po +++ b/po/bg.po
@@ -9250,7 +9250,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/ca.po b/po/ca.po index 6d479ce..f143119 100644 --- a/po/ca.po +++ b/po/ca.po
@@ -9579,7 +9579,8 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) ha fallat ($%x)" #: oleview.rc:149
diff --git a/po/cs.po b/po/cs.po index b145d8f..72edd81 100644 --- a/po/cs.po +++ b/po/cs.po
@@ -9638,7 +9638,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/da.po b/po/da.po index 70e1901..fa45f38 100644 --- a/po/da.po +++ b/po/da.po
@@ -9700,7 +9700,8 @@ msgstr "byte" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) fejlede ($%x)" #: oleview.rc:149
diff --git a/po/de.po b/po/de.po index bd1e5ec..7691ed7 100644 --- a/po/de.po +++ b/po/de.po
@@ -9571,7 +9571,8 @@ msgstr "Bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) fehlgeschlagen ($%x)" #: oleview.rc:149
diff --git a/po/el.po b/po/el.po index 5f9ce83..8a42fa0 100644 --- a/po/el.po +++ b/po/el.po
@@ -9122,7 +9122,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/en.po b/po/en.po index 27539e6..14beab7 100644 --- a/po/en.po +++ b/po/en.po
@@ -9307,7 +9307,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/en_US.po b/po/en_US.po index a0be39b..2581417 100644 --- a/po/en_US.po +++ b/po/en_US.po
@@ -9486,8 +9486,8 @@ msgstr "bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" -msgstr "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" +msgstr "LoadTypeLib( %1 ) failed ($%2!x!)" #: oleview.rc:149 msgid "Inherited Interfaces"
diff --git a/po/eo.po b/po/eo.po index f54772e..7cfe14a 100644 --- a/po/eo.po +++ b/po/eo.po
@@ -9266,7 +9266,7 @@ msgstr "%ld bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/es.po b/po/es.po index 2582ebf..29674f0 100644 --- a/po/es.po +++ b/po/es.po
@@ -9889,7 +9889,7 @@ msgstr "%ld bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/fa.po b/po/fa.po index a193dd4..91def36 100644 --- a/po/fa.po +++ b/po/fa.po
@@ -9112,7 +9112,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/fi.po b/po/fi.po index b85bd80..3f72921 100644 --- a/po/fi.po +++ b/po/fi.po
@@ -9375,7 +9375,7 @@ msgstr "%ld tavua" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/fr.po b/po/fr.po index 9712656..2921b5c 100644 --- a/po/fr.po +++ b/po/fr.po
@@ -9599,7 +9599,8 @@ msgstr "octets" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "Échec de LoadTypeLib( %s ) ($%x)" #: oleview.rc:149
diff --git a/po/he.po b/po/he.po index b713599..f9f0ca2 100644 --- a/po/he.po +++ b/po/he.po
@@ -9562,7 +9562,8 @@ msgstr "בתים" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) נכשל ($%x)" #: oleview.rc:149
diff --git a/po/hi.po b/po/hi.po index 1d1ac61..b7b1340 100644 --- a/po/hi.po +++ b/po/hi.po
@@ -8982,7 +8982,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/hu.po b/po/hu.po index d0928ed..0634a1c 100644 --- a/po/hu.po +++ b/po/hu.po
@@ -9599,7 +9599,7 @@ msgstr "%ld bájt" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/it.po b/po/it.po index 938ad65..3927290 100644 --- a/po/it.po +++ b/po/it.po
@@ -9547,7 +9547,8 @@ msgstr "bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) fallito ($%x)" #: oleview.rc:149
diff --git a/po/ja.po b/po/ja.po index ae200d6..b748f8c 100644 --- a/po/ja.po +++ b/po/ja.po
@@ -9486,7 +9486,8 @@ msgstr "バイト" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) が失敗しました ($%x)" #: oleview.rc:149
diff --git a/po/ko.po b/po/ko.po index 10f4d43..0b1ae0d 100644 --- a/po/ko.po +++ b/po/ko.po
@@ -9452,7 +9452,8 @@ msgstr "바이트" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) 실패 ($%x)" #: oleview.rc:149
diff --git a/po/lt.po b/po/lt.po index eb0ec15..d0a79e2 100644 --- a/po/lt.po +++ b/po/lt.po
@@ -9504,7 +9504,8 @@ msgstr "baitai" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) nepavyko ($%x)" #: oleview.rc:149
diff --git a/po/ml.po b/po/ml.po index 52c991d..b5f200a 100644 --- a/po/ml.po +++ b/po/ml.po
@@ -8982,7 +8982,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/nb_NO.po b/po/nb_NO.po index 1ed14d4..6abe6c7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po
@@ -9742,7 +9742,8 @@ msgstr "byte" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) feilet ($%x)" #: oleview.rc:149
diff --git a/po/nl.po b/po/nl.po index dde8027..70c6119 100644 --- a/po/nl.po +++ b/po/nl.po
@@ -9617,7 +9617,8 @@ msgstr "bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) gefaald ($%x)" #: oleview.rc:149
diff --git a/po/or.po b/po/or.po index 6971fce..9a68f525 100644 --- a/po/or.po +++ b/po/or.po
@@ -8982,7 +8982,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/pa.po b/po/pa.po index 5df8efe..8ad7069 100644 --- a/po/pa.po +++ b/po/pa.po
@@ -8982,7 +8982,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/pl.po b/po/pl.po index ece9ad6..cbca874 100644 --- a/po/pl.po +++ b/po/pl.po
@@ -9526,7 +9526,8 @@ msgstr "bajty(ów)" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) nie powiodło się ($%x)" #: oleview.rc:149
diff --git a/po/pt_BR.po b/po/pt_BR.po index 085ddbf..7efd228 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po
@@ -9810,7 +9810,8 @@ msgstr "bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) falhou ($%x)" #: oleview.rc:149
diff --git a/po/pt_PT.po b/po/pt_PT.po index fda7f45..f4ee0f9 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po
@@ -9830,7 +9830,8 @@ msgstr "bytes" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) falhou ($%x)" #: oleview.rc:149
diff --git a/po/rm.po b/po/rm.po index bf24fae..a35889d 100644 --- a/po/rm.po +++ b/po/rm.po
@@ -9034,7 +9034,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/ro.po b/po/ro.po index d140e02..afb215c 100644 --- a/po/ro.po +++ b/po/ro.po
@@ -10060,7 +10060,8 @@ msgstr "octeți" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) a eșuat ($%x)" #: oleview.rc:149
diff --git a/po/ru.po b/po/ru.po index 88f6379..aa21a61 100644 --- a/po/ru.po +++ b/po/ru.po
@@ -9508,7 +9508,8 @@ msgstr "байт" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "При вызове LoadTypeLib( %s ) произошла ошибка ($%x)" #: oleview.rc:149
diff --git a/po/sk.po b/po/sk.po index 516ef8a..ed0b852 100644 --- a/po/sk.po +++ b/po/sk.po
@@ -9132,7 +9132,7 @@ msgstr "%ld bajtov" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/sl.po b/po/sl.po index 26c1153..e9a84ef 100644 --- a/po/sl.po +++ b/po/sl.po
@@ -9524,7 +9524,8 @@ msgstr "bajtov" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) je spodletel ($%x)" #: oleview.rc:149
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index d0586f1..177c6c8 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po
@@ -9449,7 +9449,7 @@ msgstr "%ld бајтова" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 53949e6..5f71ad4 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po
@@ -9526,7 +9526,7 @@ msgstr "%ld bajtova" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/sv.po b/po/sv.po index 8918803..5cf6e13 100644 --- a/po/sv.po +++ b/po/sv.po
@@ -9472,7 +9472,8 @@ msgstr "byte" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) misslyckades ($%x)" #: oleview.rc:149
diff --git a/po/te.po b/po/te.po index 914b49a..147be06 100644 --- a/po/te.po +++ b/po/te.po
@@ -8982,7 +8982,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/th.po b/po/th.po index 832ba7d..ad115b7 100644 --- a/po/th.po +++ b/po/th.po
@@ -9135,7 +9135,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/tr.po b/po/tr.po index a2cd9fb..1881f51 100644 --- a/po/tr.po +++ b/po/tr.po
@@ -9765,7 +9765,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/uk.po b/po/uk.po index 3ad73ca..ca1e816 100644 --- a/po/uk.po +++ b/po/uk.po
@@ -9463,7 +9463,8 @@ msgstr "байт" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) не зміг ($%x)" #: oleview.rc:149
diff --git a/po/wa.po b/po/wa.po index 3ae896f..42d9ecd 100644 --- a/po/wa.po +++ b/po/wa.po
@@ -9080,7 +9080,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/wine.pot b/po/wine.pot index d0ad9c1..86f0ff2 100644 --- a/po/wine.pot +++ b/po/wine.pot
@@ -8955,7 +8955,7 @@ msgstr "" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "" #: oleview.rc:149
diff --git a/po/zh_CN.po b/po/zh_CN.po index 4ff8356..71ef863 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po
@@ -9397,7 +9397,8 @@ msgstr "字节" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) 失败 ($%x)" #: oleview.rc:149
diff --git a/po/zh_TW.po b/po/zh_TW.po index f1e895b..b263d4b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po
@@ -9429,7 +9429,8 @@ msgstr "字節" #: oleview.rc:148 -msgid "LoadTypeLib( %s ) failed ($%x)" +#, fuzzy +msgid "LoadTypeLib( %1 ) failed ($%2!x!)" msgstr "LoadTypeLib( %s ) 失敗 ($%x)" #: oleview.rc:149
diff --git a/programs/oleview/oleview.rc b/programs/oleview/oleview.rc index d5d7507..5619a21 100644 --- a/programs/oleview/oleview.rc +++ b/programs/oleview/oleview.rc
@@ -145,7 +145,7 @@ IDS_FALSE, "False" IDS_BYTES, "bytes" - IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) failed ($%x)" + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %1 ) failed ($%2!x!)" IDS_INHERITINTERFACES, "Inherited Interfaces" }
diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index b28dd90..21e9d96 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c
@@ -1198,10 +1198,14 @@ { WCHAR wszMessage[MAX_LOAD_STRING]; WCHAR wszError[MAX_LOAD_STRING]; + DWORD_PTR args[2]; LoadStringW(globals.hMainInst, IDS_ERROR_LOADTYPELIB, wszError, sizeof(wszError)/sizeof(wszError[0])); - wsprintfW(wszMessage, wszError, typelib.wszFileName, hRes); + args[0] = (DWORD_PTR)typelib.wszFileName; + args[1] = hRes; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + wszError, 0, 0, wszMessage, sizeof(wszMessage)/sizeof(*wszMessage), (__ms_va_list*)args); MessageBoxW(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; }