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

po/ar.po

@@ -9109,7 +9109,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/bg.po

@@ -9250,7 +9250,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/ca.po

@@ -9579,7 +9579,8 @@ msgid "bytes"
 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

po/cs.po

@@ -9638,7 +9638,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/da.po

@@ -9700,7 +9700,8 @@ msgid "bytes"
 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

po/de.po

@@ -9571,7 +9571,8 @@ msgid "bytes"
 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

po/el.po

@@ -9122,7 +9122,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/en.po

@@ -9307,7 +9307,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/en_US.po

@@ -9486,8 +9486,8 @@ msgid "bytes"
 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"

po/eo.po

@@ -9266,7 +9266,7 @@ msgid "bytes"
 msgstr "%ld bytes"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/es.po

@@ -9889,7 +9889,7 @@ msgid "bytes"
 msgstr "%ld bytes"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/fa.po

@@ -9112,7 +9112,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/fi.po

@@ -9375,7 +9375,7 @@ msgid "bytes"
 msgstr "%ld tavua"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/fr.po

@@ -9599,7 +9599,8 @@ msgid "bytes"
 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

po/he.po

@@ -9562,7 +9562,8 @@ msgid "bytes"
 msgstr "בתים"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) נכשל ($%x)"
 
 #: oleview.rc:149

po/hi.po

@@ -8982,7 +8982,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/hu.po

@@ -9599,7 +9599,7 @@ msgid "bytes"
 msgstr "%ld bájt"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/it.po

@@ -9547,7 +9547,8 @@ msgid "bytes"
 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

po/ja.po

@@ -9486,7 +9486,8 @@ msgid "bytes"
 msgstr "バイト"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) が失敗しました ($%x)"
 
 #: oleview.rc:149

po/ko.po

@@ -9452,7 +9452,8 @@ msgid "bytes"
 msgstr "바이트"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) 실패 ($%x)"
 
 #: oleview.rc:149

po/lt.po

@@ -9504,7 +9504,8 @@ msgid "bytes"
 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

po/ml.po

@@ -8982,7 +8982,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/nb_NO.po

@@ -9742,7 +9742,8 @@ msgid "bytes"
 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

po/nl.po

@@ -9617,7 +9617,8 @@ msgid "bytes"
 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

po/or.po

@@ -8982,7 +8982,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/pa.po

@@ -8982,7 +8982,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/pl.po

@@ -9526,7 +9526,8 @@ msgid "bytes"
 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

po/pt_BR.po

@@ -9810,7 +9810,8 @@ msgid "bytes"
 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

po/pt_PT.po

@@ -9830,7 +9830,8 @@ msgid "bytes"
 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

po/rm.po

@@ -9034,7 +9034,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/ro.po

@@ -10060,7 +10060,8 @@ msgid "bytes"
 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

po/ru.po

@@ -9508,7 +9508,8 @@ msgid "bytes"
 msgstr "байт"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "При вызове LoadTypeLib( %s ) произошла ошибка ($%x)"
 
 #: oleview.rc:149

po/sk.po

@@ -9132,7 +9132,7 @@ msgid "bytes"
 msgstr "%ld bajtov"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/sl.po

@@ -9524,7 +9524,8 @@ msgid "bytes"
 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

po/sr_RS@cyrillic.po

@@ -9449,7 +9449,7 @@ msgid "bytes"
 msgstr "%ld бајтова"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/sr_RS@latin.po

@@ -9526,7 +9526,7 @@ msgid "bytes"
 msgstr "%ld bajtova"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/sv.po

@@ -9472,7 +9472,8 @@ msgid "bytes"
 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

po/te.po

@@ -8982,7 +8982,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/th.po

@@ -9135,7 +9135,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/tr.po

@@ -9765,7 +9765,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/uk.po

@@ -9463,7 +9463,8 @@ msgid "bytes"
 msgstr "байт"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) не зміг ($%x)"
 
 #: oleview.rc:149

po/wa.po

@@ -9080,7 +9080,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/wine.pot

@@ -8955,7 +8955,7 @@ msgid "bytes"
 msgstr ""
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr ""
 
 #: oleview.rc:149

po/zh_CN.po

@@ -9397,7 +9397,8 @@ msgid "bytes"
 msgstr "字节"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) 失败 ($%x)"
 
 #: oleview.rc:149

po/zh_TW.po

@@ -9429,7 +9429,8 @@ msgid "bytes"
 msgstr "字節"
 
 #: oleview.rc:148
-msgid "LoadTypeLib( %s ) failed ($%x)"
+#, fuzzy
+msgid "LoadTypeLib( %1 ) failed ($%2!x!)"
 msgstr "LoadTypeLib( %s ) 失敗 ($%x)"
 
 #: oleview.rc:149

programs/oleview/oleview.rc

@@ -145,7 +145,7 @@ STRINGTABLE
     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"
 }
 

programs/oleview/typelib.c

@@ -1198,10 +1198,14 @@ static int PopulateTree(void)
     {
         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;
     }