wineconsole: Always show an ASCII string in the font test.

Michael Stefaniuc mstefani at redhat.de
Tue Apr 20 04:03:25 CDT 2010 

---
This was probably the intent for having IDS_FNT_PREVIEW_2 in the
resources. Though except in the Russian translation it was never used.
This patch supersedes the "wineconsole: Fix the Russian translation."


 programs/wineconsole/dialog.c          |   35 ++++++++++++++-----------------
 programs/wineconsole/wineconsole_Cs.rc |    3 +-
 programs/wineconsole/wineconsole_De.rc |    3 +-
 programs/wineconsole/wineconsole_En.rc |    3 +-
 programs/wineconsole/wineconsole_Eo.rc |    3 +-
 programs/wineconsole/wineconsole_Es.rc |    3 +-
 programs/wineconsole/wineconsole_Fr.rc |    3 +-
 programs/wineconsole/wineconsole_Hu.rc |    3 +-
 programs/wineconsole/wineconsole_It.rc |    3 +-
 programs/wineconsole/wineconsole_Ko.rc |    3 +-
 programs/wineconsole/wineconsole_Lt.rc |    3 +-
 programs/wineconsole/wineconsole_Nl.rc |    3 +-
 programs/wineconsole/wineconsole_No.rc |    3 +-
 programs/wineconsole/wineconsole_Pl.rc |    3 +-
 programs/wineconsole/wineconsole_Pt.rc |    6 +---
 programs/wineconsole/wineconsole_Ru.rc |    3 +-
 programs/wineconsole/wineconsole_Si.rc |    3 +-
 programs/wineconsole/wineconsole_Sv.rc |    3 +-
 programs/wineconsole/wineconsole_Tr.rc |    3 +-
 programs/wineconsole/wineconsole_Zh.rc |    6 +---
 programs/wineconsole/wineconsole_res.h |    3 +-
 21 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
index cde013f..d452108 100644
--- a/programs/wineconsole/dialog.c
+++ b/programs/wineconsole/dialog.c
@@ -187,25 +187,22 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam,
             hFont = (HFONT)GetWindowLongPtr(hWnd, 0L);
             if (hFont)
             {
-                WCHAR	buf1[256];
-                WCHAR	buf2[256];
-                int	len1, len2;
-
-                len1 = LoadString(GetModuleHandle(NULL), IDS_FNT_PREVIEW_1,
-                                  buf1, sizeof(buf1) / sizeof(WCHAR));
-                len2 = LoadString(GetModuleHandle(NULL), IDS_FNT_PREVIEW_2,
-                                  buf2, sizeof(buf2) / sizeof(WCHAR));
-                buf1[len1] = buf2[len2] = 0;
-                if (len1)
-                {
-                    hOldFont = SelectObject(ps.hdc, hFont);
-                    SetBkColor(ps.hdc, WCUSER_ColorMap[GetWindowLong(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]);
-                    SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLong(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]);
-                    TextOut(ps.hdc, 0, 0, buf1, len1);
-                    if (len2)
-                        TextOut(ps.hdc, 0, di->font[size_idx].height, buf2, len2);
-                    SelectObject(ps.hdc, hOldFont);
-                }
+                WCHAR ascii[] = {'A','S','C','I','I',':',' ','a','b','c','X','Y','Z','\0'};
+                WCHAR buf[256];
+                int   len;
+
+                len = LoadString(GetModuleHandle(NULL), IDS_FNT_PREVIEW,
+                                 buf, sizeof(buf) / sizeof(buf[0]));
+                buf[len] = 0;
+
+                hOldFont = SelectObject(ps.hdc, hFont);
+                SetBkColor(ps.hdc, WCUSER_ColorMap[GetWindowLong(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]);
+                SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLong(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]);
+                if (len)
+                    TextOut(ps.hdc, 0, 0, buf, len);
+                TextOut(ps.hdc, 0, di->font[size_idx].height, ascii,
+                        sizeof(ascii)/sizeof(ascii[0]) - 1);
+                SelectObject(ps.hdc, hOldFont);
             }
             EndPaint(hWnd, &ps);
         }
diff --git a/programs/wineconsole/wineconsole_Cs.rc b/programs/wineconsole/wineconsole_Cs.rc
index 719d70f..06fc4bd 100644
--- a/programs/wineconsole/wineconsole_Cs.rc
+++ b/programs/wineconsole/wineconsole_Cs.rc
@@ -37,8 +37,7 @@ IDS_SELECTALL,		"Vy&brat v
 IDS_SCROLL,		"Rolova&t"
 IDS_SEARCH,		"Hl&edat"
 IDS_FNT_DISPLAY,	"Každý znak je %ld pixelù široký a %ld pixelù vysoký"
-IDS_FNT_PREVIEW_1,	"Toto je test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Toto je test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Defaultní nastavení"
 IDS_DLG_TIT_CURRENT,    "Setup - Souèasné nastavení"
 IDS_DLG_TIT_ERROR,	"Chyba nastavení"
diff --git a/programs/wineconsole/wineconsole_De.rc b/programs/wineconsole/wineconsole_De.rc
index 0841152..745687d 100644
--- a/programs/wineconsole/wineconsole_De.rc
+++ b/programs/wineconsole/wineconsole_De.rc
@@ -34,8 +34,7 @@ IDS_SELECTALL,		"&Alles auswählen"
 IDS_SCROLL,		"Sc&rollen"
 IDS_SEARCH,		"&Suchen"
 IDS_FNT_DISPLAY,	"Jeder Buchstabe ist %ld Pixel breit und %ld Pixel hoch"
-IDS_FNT_PREVIEW_1,	"Dies ist ein Test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Dies ist ein Test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Standardeinstellungen"
 IDS_DLG_TIT_CURRENT,    "Setup - aktuelle Einstellungen"
 IDS_DLG_TIT_ERROR,      "Konfigurationsfehler"
diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc
index c9b849a..f453a75 100644
--- a/programs/wineconsole/wineconsole_En.rc
+++ b/programs/wineconsole/wineconsole_En.rc
@@ -32,8 +32,7 @@ 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_PREVIEW_1,	"This is a test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"This is a test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Default settings"
 IDS_DLG_TIT_CURRENT,    "Setup - Current settings"
 IDS_DLG_TIT_ERROR,	"Configuration error"
diff --git a/programs/wineconsole/wineconsole_Eo.rc b/programs/wineconsole/wineconsole_Eo.rc
index c60a9d1..57ba243 100644
--- a/programs/wineconsole/wineconsole_Eo.rc
+++ b/programs/wineconsole/wineconsole_Eo.rc
@@ -34,8 +34,7 @@ IDS_SELECTALL,		"&Elekton 
 IDS_SCROLL,		"&Ruliøu"
 IDS_SEARCH,		"&Seræu"
 IDS_FNT_DISPLAY,	"Tipo estas larøa %ld bilderojn kaj alta %ld bilderojn"
-IDS_FNT_PREVIEW_1,	"Æi tiu estas provo"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Æi tiu estas provo"
 IDS_DLG_TIT_DEFAULT,    "Defaýltaj Agordoj"
 IDS_DLG_TIT_CURRENT,    "Nunaj Agordoj"
 IDS_DLG_TIT_ERROR,	"Eroro de agordado"
diff --git a/programs/wineconsole/wineconsole_Es.rc b/programs/wineconsole/wineconsole_Es.rc
index f1340e4..da6e1fb 100644
--- a/programs/wineconsole/wineconsole_Es.rc
+++ b/programs/wineconsole/wineconsole_Es.rc
@@ -35,8 +35,7 @@ IDS_SELECTALL,		"&Seleccionar todo"
 IDS_SCROLL,		"Sc&roll"
 IDS_SEARCH,		"&Buscar"
 IDS_FNT_DISPLAY,	"Cada caracter tiene %ld píxeles de ancho por %ld píxeles de alto"
-IDS_FNT_PREVIEW_1,	"Esto es una prueba"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Esto es una prueba"
 IDS_DLG_TIT_DEFAULT,    "Configuración - Valores por defecto"
 IDS_DLG_TIT_CURRENT,    "Configuración - Valores actuales"
 IDS_DLG_TIT_ERROR,	"Error de configuración"
diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc
index 99aace4..1abcb27 100644
--- a/programs/wineconsole/wineconsole_Fr.rc
+++ b/programs/wineconsole/wineconsole_Fr.rc
@@ -37,8 +37,7 @@ IDS_SELECTALL,		"&Sélectionner tout"
 IDS_SCROLL,		"&Défiler"
 IDS_SEARCH,		"C&hercher"
 IDS_FNT_DISPLAY,	"Chaque caractère a %ld pixels de largeur et %ld pixels de hauteur"
-IDS_FNT_PREVIEW_1,	"Ceci est un test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Ceci est un test"
 IDS_DLG_TIT_DEFAULT,    "Configuration par défaut"
 IDS_DLG_TIT_CURRENT,    "Configuration courante"
 IDS_DLG_TIT_ERROR,	"Erreur de configuration"
diff --git a/programs/wineconsole/wineconsole_Hu.rc b/programs/wineconsole/wineconsole_Hu.rc
index 5a269bf..bd901d9 100644
--- a/programs/wineconsole/wineconsole_Hu.rc
+++ b/programs/wineconsole/wineconsole_Hu.rc
@@ -33,8 +33,7 @@ IDS_SELECTALL,		"&Az 
 IDS_SCROLL,		"&Görgetés"
 IDS_SEARCH,		"&Keresés"
 IDS_FNT_DISPLAY,	"Minden karakter %ld pixel széles és %ld pixel magas"
-IDS_FNT_PREVIEW_1,	"Ez egy teszt"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Ez egy teszt"
 IDS_DLG_TIT_DEFAULT,    "Beállítás - alapértelmezett beállítások"
 IDS_DLG_TIT_CURRENT,    "Beállítás - aktuális beállítások"
 IDS_DLG_TIT_ERROR,      "Configuration error"
diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc
index 61b7b9d..4f6c7fa 100644
--- a/programs/wineconsole/wineconsole_It.rc
+++ b/programs/wineconsole/wineconsole_It.rc
@@ -35,8 +35,7 @@ IDS_SELECTALL,		"&Seleziona tutto"
 IDS_SCROLL,		"Sc&orri"
 IDS_SEARCH,		"C&erca"
 IDS_FNT_DISPLAY,	"Il carattere è %ld pixel di larghezza e %ld pixel di altezza"
-IDS_FNT_PREVIEW_1,	"Questa è una prova"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Questa è una prova"
 IDS_DLG_TIT_DEFAULT,    "Impostazioni di Default"
 IDS_DLG_TIT_CURRENT,    "Impostazioni correnti"
 IDS_DLG_TIT_ERROR,	"Errore di configurazione"
diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc
index 9478590..bcaa879 100644
--- a/programs/wineconsole/wineconsole_Ko.rc
+++ b/programs/wineconsole/wineconsole_Ko.rc
@@ -33,8 +33,7 @@ IDS_SELECTALL,		"
 IDS_SCROLL,		"½ºÅ©·Ñ(&R)"
 IDS_SEARCH,		"ã±â(&E)"
 IDS_FNT_DISPLAY,	"°¢°¢ÀÇ ±ÛÀÚ´Â %ld  Çȼ¿ ³Êºñ¿¡ %ld Çȼ¿ ³ôÀ̸¦ °¡Áý´Ï´Ù"
-IDS_FNT_PREVIEW_1,	"ÀÌ°ÍÀº Å×½ºÆ®ÀÔ´Ï´Ù"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"ÀÌ°ÍÀº Å×½ºÆ®ÀÔ´Ï´Ù"
 IDS_DLG_TIT_DEFAULT,    "¼³Ä¡ - ±âº» ¼³Á¤"
 IDS_DLG_TIT_CURRENT,    "¼³Ä¡ - ÇöÀç ¼³Á¤"
 IDS_DLG_TIT_ERROR,	"¼³Á¤ ¿¡·¯"
diff --git a/programs/wineconsole/wineconsole_Lt.rc b/programs/wineconsole/wineconsole_Lt.rc
index 311bb1f..02140d6 100644
--- a/programs/wineconsole/wineconsole_Lt.rc
+++ b/programs/wineconsole/wineconsole_Lt.rc
@@ -35,8 +35,7 @@ IDS_SELECTALL,             "&PažymÄ—ti viskÄ
"
 IDS_SCROLL,                "&Slinkti"
 IDS_SEARCH,                "&Ieškoti"
 IDS_FNT_DISPLAY,           "Kiekvienas simbolis yra %ld pikselių pločio ir %ld pikselių aukščio"
-IDS_FNT_PREVIEW_1,         "ÄŒia yra testas"
-IDS_FNT_PREVIEW_2,         ""
+IDS_FNT_PREVIEW,         "ÄŒia yra testas"
 IDS_DLG_TIT_DEFAULT,       "Konfigūracija - numatytosios nuostatos"
 IDS_DLG_TIT_CURRENT,       "Konfigūracija - dabartinės nuostatos"
 IDS_DLG_TIT_ERROR,         "Konfigūracijos klaida"
diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc
index d02fe76..8500763 100644
--- a/programs/wineconsole/wineconsole_Nl.rc
+++ b/programs/wineconsole/wineconsole_Nl.rc
@@ -35,8 +35,7 @@ IDS_SELECTALL,		"&Alles selecteren"
 IDS_SCROLL,		"Sc&rollen"
 IDS_SEARCH,		"&Zoeken"
 IDS_FNT_DISPLAY,	"Elk karakter is %ld pixels breed en %ld pixels hoog"
-IDS_FNT_PREVIEW_1,	"Dit is een test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Dit is een test"
 IDS_DLG_TIT_DEFAULT,    "Configuratie - standaard instelllingen"
 IDS_DLG_TIT_CURRENT,    "Configuratie - huidige instellingen"
 IDS_DLG_TIT_ERROR,	"Configuratiefout"
diff --git a/programs/wineconsole/wineconsole_No.rc b/programs/wineconsole/wineconsole_No.rc
index 2a11dfb..831fd89 100644
--- a/programs/wineconsole/wineconsole_No.rc
+++ b/programs/wineconsole/wineconsole_No.rc
@@ -32,8 +32,7 @@ IDS_SELECTALL,		"Merk &alt"
 IDS_SCROLL,		"&Rull"
 IDS_SEARCH,		"&Søk"
 IDS_FNT_DISPLAY,	"Hvert tegn er %ld piksler bredt og %ld piksler høyt"
-IDS_FNT_PREVIEW_1,	"Dette er en test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Dette er en test"
 IDS_DLG_TIT_DEFAULT,    "Standardinnstillinger"
 IDS_DLG_TIT_CURRENT,    "Gjeldende innstillinger"
 IDS_DLG_TIT_ERROR,	"Oppsettsfeil"
diff --git a/programs/wineconsole/wineconsole_Pl.rc b/programs/wineconsole/wineconsole_Pl.rc
index 9ad3799..f420f50 100644
--- a/programs/wineconsole/wineconsole_Pl.rc
+++ b/programs/wineconsole/wineconsole_Pl.rc
@@ -33,8 +33,7 @@ IDS_SELECTALL,		"Z&aznacz wszystko"
 IDS_SCROLL,		"&Przewijaj"
 IDS_SEARCH,		"Sz&ukaj"
 IDS_FNT_DISPLAY,	"Ka¿dy znak ma szerokoœæ %ld i wysokoœæ %ld punktów"
-IDS_FNT_PREVIEW_1,	"To jest test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"To jest test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Domyœlne ustawienia"
 IDS_DLG_TIT_CURRENT,    "Setup - Wybrane ustawienia"
 IDS_DLG_TIT_ERROR,	"B³¹d konfiguracji"
diff --git a/programs/wineconsole/wineconsole_Pt.rc b/programs/wineconsole/wineconsole_Pt.rc
index 934607c..49186f7 100644
--- a/programs/wineconsole/wineconsole_Pt.rc
+++ b/programs/wineconsole/wineconsole_Pt.rc
@@ -39,8 +39,7 @@ IDS_SELECTALL,		"&Selecionar tudo"
 IDS_SCROLL,		"&Rolar"
 IDS_SEARCH,		"&Pesquisar"
 IDS_FNT_DISPLAY,	"Cada caracter tem %ld pixels de largura por %ld pixels de altura"
-IDS_FNT_PREVIEW_1,	"Este é um teste"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Este é um teste"
 IDS_DLG_TIT_DEFAULT,    "Setup - configurações padrões"
 IDS_DLG_TIT_CURRENT,    "Setup - configurações atuais"
 IDS_DLG_TIT_ERROR,	"Erro de configuração"
@@ -61,8 +60,7 @@ IDS_SELECTALL,		"&Seleccionar tudo"
 IDS_SCROLL,		"&Rolar"
 IDS_SEARCH,		"&Pesquisar"
 IDS_FNT_DISPLAY,	"Cada caracter tem %ld pixels de largura por %ld pixels de altura"
-IDS_FNT_PREVIEW_1,	"Este é um teste"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Este é um teste"
 IDS_DLG_TIT_DEFAULT,    "Configuração - configurações predefinidas"
 IDS_DLG_TIT_CURRENT,    "Configuração - configurações actuais"
 IDS_DLG_TIT_ERROR,	"Erro de configuração"
diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc
index 11ea6d3..e269906 100644
--- a/programs/wineconsole/wineconsole_Ru.rc
+++ b/programs/wineconsole/wineconsole_Ru.rc
@@ -38,8 +38,7 @@ IDS_SELECTALL,		"Выделить в&сё"
 IDS_SCROLL,		"Прок&рутить"
 IDS_SEARCH,		"По&иск"
 IDS_FNT_DISPLAY,	"Каждый символ %ld пикселей в ширину и %ld пикселей в высоту"
-IDS_FNT_PREVIEW_1,	"Это тест"
-IDS_FNT_PREVIEW_2,	"This is a test"
+IDS_FNT_PREVIEW,	"Это тест"
 IDS_DLG_TIT_DEFAULT,       "Настройка - Установки по умолчанию"
 IDS_DLG_TIT_CURRENT,       "Настройка - Текущие установки"
 IDS_DLG_TIT_ERROR,         "Ошибка настройки"
diff --git a/programs/wineconsole/wineconsole_Si.rc b/programs/wineconsole/wineconsole_Si.rc
index 79b9093..47c614d 100644
--- a/programs/wineconsole/wineconsole_Si.rc
+++ b/programs/wineconsole/wineconsole_Si.rc
@@ -34,8 +34,7 @@ IDS_SELECTALL,		"Izberi &vse"
 IDS_SCROLL,		"&Drsenje"
 IDS_SEARCH,		"&Iskanje"
 IDS_FNT_DISPLAY,	"Vsak znak je Å¡irok %ld pik in visok %ld pik"
-IDS_FNT_PREVIEW_1,	"Preizkusno besedilo"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Preizkusno besedilo"
 IDS_DLG_TIT_DEFAULT,    "Privzete nastavitve"
 IDS_DLG_TIT_CURRENT,    "Trenutne nastavitve"
 IDS_DLG_TIT_ERROR,	"Nastavitvena napaka"
diff --git a/programs/wineconsole/wineconsole_Sv.rc b/programs/wineconsole/wineconsole_Sv.rc
index 509e876..59b197e 100644
--- a/programs/wineconsole/wineconsole_Sv.rc
+++ b/programs/wineconsole/wineconsole_Sv.rc
@@ -32,8 +32,7 @@ IDS_SELECTALL,		"&Markera allt"
 IDS_SCROLL,		"R&ulla"
 IDS_SEARCH,		"S&ök"
 IDS_FNT_DISPLAY,	"Varje bokstav är %ld bildpunkter bred och %ld bildpunkter hög"
-IDS_FNT_PREVIEW_1,	"Det här är ett test"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Det här är ett test"
 IDS_DLG_TIT_DEFAULT,    "Setup - Standardinställningar"
 IDS_DLG_TIT_CURRENT,    "Setup - Aktuella inställningar"
 IDS_DLG_TIT_ERROR,	"Konfigurationsfel"
diff --git a/programs/wineconsole/wineconsole_Tr.rc b/programs/wineconsole/wineconsole_Tr.rc
index 7642405..75e6cdb 100644
--- a/programs/wineconsole/wineconsole_Tr.rc
+++ b/programs/wineconsole/wineconsole_Tr.rc
@@ -34,8 +34,7 @@ IDS_SELECTALL,		"&T
 IDS_SCROLL,		"Ka&ydýr"
 IDS_SEARCH,		"A&ra"
 IDS_FNT_DISPLAY,	"Her karakter %ld piksel geniþliðinde ve %ld piksel yüksekliðinde"
-IDS_FNT_PREVIEW_1,	"Bu bir sýnamadýr"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"Bu bir sýnamadýr"
 IDS_DLG_TIT_DEFAULT,    "Ayarla - Öntanýmlý ayarlar"
 IDS_DLG_TIT_CURRENT,    "Ayarla - Geçerli ayarlar"
 IDS_DLG_TIT_ERROR,	"Yapýlandýrma hatasý"
diff --git a/programs/wineconsole/wineconsole_Zh.rc b/programs/wineconsole/wineconsole_Zh.rc
index 88375bb..4e06416 100644
--- a/programs/wineconsole/wineconsole_Zh.rc
+++ b/programs/wineconsole/wineconsole_Zh.rc
@@ -38,8 +38,7 @@ IDS_SELECTALL,		"å
¨é€‰(&S)"
 IDS_SCROLL,		"滚动(&R)"
 IDS_SEARCH,		"搜索(&E)"
 IDS_FNT_DISPLAY,	"每个字都是 %ld 个像素宽，%ld 个像素高"
-IDS_FNT_PREVIEW_1,	"这是一段测试语句"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"这是一段测试语句"
 IDS_DLG_TIT_DEFAULT,    "é
ç½® - 默认设置"
 IDS_DLG_TIT_CURRENT,    "é
ç½® - 当前设置"
 IDS_DLG_TIT_ERROR,      "é
ç½®é”™è¯¯"
@@ -141,8 +140,7 @@ IDS_SELECTALL,		"å
¨é¸(&S)"
 IDS_SCROLL,		"滾動(&R)"
 IDS_SEARCH,		"搜索(&E)"
 IDS_FNT_DISPLAY,	"每個字都是 %ld 個像素寬，%ld 個像素高"
-IDS_FNT_PREVIEW_1,	"這是一段測試語句"
-IDS_FNT_PREVIEW_2,	""
+IDS_FNT_PREVIEW,	"這是一段測試語句"
 IDS_DLG_TIT_DEFAULT,    "é
ç½® - 默認設定"
 IDS_DLG_TIT_CURRENT,    "é
ç½® - 當前設定"
 IDS_DLG_TIT_ERROR,      "é
ç½®éŒ¯èª¤"
diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h
index a128aa9..ac62b58 100644
--- a/programs/wineconsole/wineconsole_res.h
+++ b/programs/wineconsole/wineconsole_res.h
@@ -41,8 +41,7 @@
 #define IDS_DLG_ERR_SBWINSIZE   0x130
 
 #define IDS_FNT_DISPLAY		0x200
-#define IDS_FNT_PREVIEW_1	0x201
-#define IDS_FNT_PREVIEW_2	0x202
+#define IDS_FNT_PREVIEW         0x201
 
 #define IDS_CMD_INVALID_EVENT_ID   0x300
 #define IDS_CMD_INVALID_BACKEND    0x301
-- 
1.6.6.1

More information about the wine-patches mailing list