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

po/ar.po

@@ -10250,7 +10250,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/bg.po

@@ -10405,7 +10405,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/ca.po

@@ -10761,7 +10761,8 @@ msgstr ""
 "la finestra"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Cada caràcter és %ld píxels d'ampla per %ld píxels d'alta"
 
 #: wineconsole.rc:35

po/cs.po

@@ -10871,7 +10871,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Zásobník obrazovky musí být větší nebo stejně velký jakzásobník okna"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Každý znak je %ld pixelů široký a %ld pixelů vysoký"
 
 #: wineconsole.rc:35

po/da.po

@@ -10953,7 +10953,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Skærm buffer størrelsen, skal være større eller lig med vinduet"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Hvert tegn er %ld pixel bred og %ld pixel høj"
 
 #: wineconsole.rc:35

po/de.po

@@ -10799,7 +10799,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Die Bildschirmgröße muß größer oder gleich der des Fensters sein"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Jeder Buchstabe ist %ld Pixel breit und %ld Pixel hoch"
 
 #: wineconsole.rc:35

po/el.po

@@ -10253,7 +10253,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/en.po

@@ -10482,7 +10482,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/en_US.po

@@ -10679,8 +10679,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Screen buffer size must be greater or equal to the window's one"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
-msgstr "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
+msgstr "Each character is %1!u! pixels wide on %2!u! pixels high"
 
 #: wineconsole.rc:35
 msgid "This is a test"

po/eo.po

@@ -10415,7 +10415,8 @@ msgstr ""
 "Ekran-bufra grandeco devas esti pli granda aý egala ol fenestr-bufra tiu"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Tipo estas larøa %ld bilderojn kaj alta %ld bilderojn"
 
 #: wineconsole.rc:35

po/es.po

@@ -11157,7 +11157,8 @@ msgstr ""
 "ventana"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Cada caracter tiene %ld píxeles de ancho por %ld píxeles de alto"
 
 #: wineconsole.rc:35

po/fa.po

@@ -10253,7 +10253,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/fi.po

@@ -10536,7 +10536,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/fr.po

@@ -10819,7 +10819,8 @@ msgstr ""
 "de la fenêtre"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Chaque caractère fait %ld pixels de large et %ld pixels de haut"
 
 #: wineconsole.rc:35

po/he.po

@@ -10819,7 +10819,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "גודל מאגר המסך חייב להיות גדול או שווה לזה של החלון"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "כל תו הוא ברוחב %ld פיקסלים על גובה של %ld פיקסלים"
 
 #: wineconsole.rc:35

po/hi.po

@@ -10115,7 +10115,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/hu.po

@@ -10809,7 +10809,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Minden karakter %ld pixel széles és %ld pixel magas"
 
 #: wineconsole.rc:35

po/it.po

@@ -10757,7 +10757,8 @@ msgstr ""
 "finestra"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Il carattere è largo %ld pixel e alto %ld pixel"
 
 #: wineconsole.rc:35

po/ja.po

@@ -10678,7 +10678,8 @@ msgstr ""
 "スクリーン バッファ サイズはウィンドウ バッファ サイズ以上にしてください。"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "それぞれの文字は %ld ピクセルの幅 %ld ピクセルの高さ"
 
 #: wineconsole.rc:35

po/ko.po

@@ -10638,7 +10638,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다."
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "각각의 글자는 %ld  픽셀 너비에 %ld 픽셀 높이를 가집니다"
 
 #: wineconsole.rc:35

po/lt.po

@@ -10703,7 +10703,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Ekrano buferio dydis turi būti didesnis arba lygus lango buferiui"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Kiekvienas simbolis yra %ld pikselių pločio ir %ld pikselių aukščio"
 
 #: wineconsole.rc:35

po/ml.po

@@ -10115,7 +10115,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/nb_NO.po

@@ -10984,7 +10984,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Skjermens hurtigminnestørrelse må være større eller lik vinduets"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Hvert tegn er %ld piksler bredt og %ld piksler høyt"
 
 #: wineconsole.rc:35

po/nl.po

@@ -10841,7 +10841,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "De schermbuffer moet groter dan of gelijk zijn aan de vensterbuffer"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Elk karakter is %ld pixels breed en %ld pixels hoog"
 
 #: wineconsole.rc:35

po/or.po

@@ -10115,7 +10115,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/pa.po

@@ -10115,7 +10115,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/pl.po

@@ -10677,7 +10677,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Wielkość bufora ekranu musi być większa niż wielkość bufora okna."
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Każdy znak ma szerokość %ld i wysokość %ld punktów"
 
 #: wineconsole.rc:35

po/pt_BR.po

@@ -11072,7 +11072,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Tamanho do buffer de tela deve ser maior ou igual ao da janela"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Cada caracter tem %ld pixels de largura por %ld pixels de altura"
 
 #: wineconsole.rc:35

po/pt_PT.po

@@ -11088,7 +11088,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "O tamanho do 'buffer' do ecrã deve ser maior ou igual ao da janela"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Cada caracter tem %ld pixels de largura por %ld pixels de altura"
 
 #: wineconsole.rc:35

po/rm.po

@@ -10162,7 +10162,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/ro.po

@@ -11304,7 +11304,8 @@ msgstr ""
 "cea a ferestrei"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Fiecare caracter are %ld pixeli lățime și %ld pixeli înălțime"
 
 #: wineconsole.rc:35

po/ru.po

@@ -10690,7 +10690,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Размер буфера экрана должен быть не менее буфера окна"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Каждый символ %ld пикселей в ширину и %ld пикселей в высоту"
 
 #: wineconsole.rc:35

po/sk.po

@@ -10257,7 +10257,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/sl.po

@@ -10732,7 +10732,8 @@ msgstr ""
 "Velikost zaslonskega medpomnilnika mora biti večja ali enaka okenskemu."
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Vsak znak je širok %ld točk in visok %ld točk"
 
 #: wineconsole.rc:35

po/sr_RS@cyrillic.po

@@ -10643,7 +10643,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/sr_RS@latin.po

@@ -10722,7 +10722,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/sv.po

@@ -10677,7 +10677,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Varje bokstav är %ld bildpunkter bred och %ld bildpunkter hög"
 
 #: wineconsole.rc:35

po/te.po

@@ -10115,7 +10115,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/th.po

@@ -10260,7 +10260,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/tr.po

@@ -10993,7 +10993,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Ekran tamponu en az pencereninki kadar büyük olmalıdır"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Her karakter %ld piksel genişliğinde ve %ld piksel yüksekliğinde"
 
 #: wineconsole.rc:35

po/uk.po

@@ -10663,7 +10663,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "Розмір буфера екрану повинен бути не менший буфера вікна"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "Кожен символ має %ld пікселів в ширину і %ld пікселів в висоту"
 
 #: wineconsole.rc:35

po/wa.po

@@ -10216,7 +10216,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/wine.pot

@@ -10087,7 +10087,7 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr ""
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr ""
 
 #: wineconsole.rc:35

po/zh_CN.po

@@ -10585,7 +10585,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "屏幕缓冲区大小必须不小于窗口"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "每个字符都是 %ld 像素宽，%ld 像素高"
 
 #: wineconsole.rc:35

po/zh_TW.po

@@ -10645,7 +10645,8 @@ msgid "Screen buffer size must be greater or equal to the window's one"
 msgstr "螢幕緩存大小必須大於或等於視窗緩存"
 
 #: wineconsole.rc:34
-msgid "Each character is %ld pixels wide on %ld pixels high"
+#, fuzzy
+msgid "Each character is %1!u! pixels wide on %2!u! pixels high"
 msgstr "每個字都是 %ld 個像素寬，%ld 個像素高"
 
 #: wineconsole.rc:35

programs/wineconsole/dialog.c

@@ -415,6 +415,7 @@ static BOOL  select_font(struct dialog_info* di)
     int		font_idx, size_idx;
     WCHAR	buf[256];
     WCHAR	fmt[128];
+    DWORD_PTR   args[2];
     LOGFONTW    lf;
     HFONT       hFont, hOldFont;
     struct config_data config;
@@ -439,7 +440,10 @@ static BOOL  select_font(struct dialog_info* di)
     if (hOldFont) DeleteObject(hOldFont);
 
     LoadStringW(GetModuleHandleW(NULL), IDS_FNT_DISPLAY, fmt, sizeof(fmt) / sizeof(fmt[0]));
-    wsprintfW(buf, fmt, config.cell_width, config.cell_height);
+    args[0] = config.cell_width;
+    args[1] = config.cell_height;
+    FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                   fmt, 0, 0, buf, sizeof(buf)/sizeof(*buf), (__ms_va_list*)args);
 
     SendDlgItemMessageW(di->hDlg, IDC_FNT_FONT_INFO, WM_SETTEXT, 0, (LPARAM)buf);
 

programs/wineconsole/wineconsole.rc

@@ -31,7 +31,7 @@ IDS_PASTE,		"&Paste"
 IDS_SELECTALL,		"&Select all"
 IDS_SCROLL,		"Sc&roll"
 IDS_SEARCH,		"S&earch"
-IDS_FNT_DISPLAY,	"Each character is %ld pixels wide on %ld pixels high"
+IDS_FNT_DISPLAY,	"Each character is %1!u! pixels wide on %2!u! pixels high"
 IDS_FNT_PREVIEW,	"This is a test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Default settings"
 IDS_DLG_TIT_CURRENT,    "Setup - Current settings"