- Fix the WineMine Icon in the Main window and About window (parts of the patch in bug #2397 by Mario Kacmar (kario AT szm DOT sk) applied)

- Make the dialogs of all languages consistent
See issue #2397 for more details.

svn path=/trunk/; revision=27760
This commit is contained in:
Colin Finck 2007-07-20 19:18:35 +00:00
parent 5b1cf1f67f
commit 979b7cf89d
16 changed files with 75 additions and 79 deletions

View file

@ -76,8 +76,8 @@ CAPTION "
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Äîáðå", IDOK, 50, 60, 55, 15
}

View file

@ -75,8 +75,8 @@ CAPTION "
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "Unter der Wine Lizenz", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15
}

View file

@ -76,8 +76,8 @@ CAPTION "
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -76,8 +76,8 @@ CAPTION "About"
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -76,8 +76,8 @@ CAPTION "Acerca de"
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Aceptar", IDOK, 50, 60, 55, 15
}

View file

@ -76,15 +76,15 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON "Annuler", IDCANCEL, 40, 50, 50, 15
}
DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "À propos"
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "Sous licence Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -75,8 +75,8 @@ CAPTION "Tentang"
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "di bawah lisensi Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -3,7 +3,7 @@
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE {
IDS_APPNAME, "Prato fiorito"
IDS_APPNAME, "Campo minato"
}
@ -23,7 +23,7 @@ MENU_WINEMINE MENU DISCARDABLE
}
POPUP "&Info" {
MENUITEM "&Tempi migliori", IDM_TIMES
MENUITEM "&Informazioni su prato fiorito", IDM_ABOUT
MENUITEM "&Informazioni su Campo minato", IDM_ABOUT
}
}
@ -62,7 +62,7 @@ FONT 8, "MS Shell Dlg"
{
LTEXT "Righe", IDNONE, 5, 5, 30, 10
LTEXT "Colonne", IDNONE, 5, 35, 30, 10
LTEXT "Fiori", IDNONE, 5, 65, 30, 10
LTEXT "Mine", IDNONE, 5, 65, 30, 10
EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER
EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER
EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER
@ -72,12 +72,12 @@ FONT 8, "MS Shell Dlg"
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Informazioni su Prato fiorito"
CAPTION "Informazioni su Campo minato"
FONT 8, "MS Shell Dlg"
{
LTEXT "Campo fiorito", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Sotto licenza Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
LTEXT "Campo minato", IDNONE, 10, 10, 55, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "Sotto licenza Wine", IDNONE, 35, 35, 100, 10
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -27,10 +27,10 @@ MENU_WINEMINE MENU DISCARDABLE
}
}
DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Beste tider"
FONT 8, "MS Shell Dlg"
{
GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45
LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8
@ -45,20 +45,20 @@ CAPTION "Beste tider"
DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15
}
DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "gratulerer!"
FONT 8, "MS Shell Dlg"
{
LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10
EDITTEXT IDC_EDITNAME, 25, 20, 110, 12
DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15
}
DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Egendefinert spill"
FONT 8, "MS Shell Dlg"
{
LTEXT "Høyde", IDNONE, 5, 5, 30, 10
LTEXT "Bredde", IDNONE, 5, 35, 30, 10
@ -70,14 +70,14 @@ CAPTION "Egendefinert spill"
PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15
}
DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Om"
FONT 8, "MS Shell Dlg"
{
LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10
ICON "Minesveiper", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -76,8 +76,8 @@ CAPTION "Over"
FONT 8, "MS Shell Dlg"
{
LTEXT "WineMine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "onder de Wine licentie", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15
}

View file

@ -34,10 +34,10 @@ MENU_WINEMINE MENU DISCARDABLE
}
}
DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Najlepsze czasy"
FONT 8, "MS Shell Dlg"
{
GROUPBOX "Najlepsze czasy", IDNONE, 10, 10, 140, 45
LTEXT "Pocz¹tkuj¹cy", IDNONE, 20, 20, 40, 8
@ -52,20 +52,20 @@ CAPTION "Najlepsze czasy"
DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15
}
DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Gratulacje!"
FONT 8, "MS Shell Dlg"
{
LTEXT "Wpisz swoje imiê", IDNONE, 10, 10, 150, 10
EDITTEXT IDC_EDITNAME, 25, 20, 110, 12
DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15
}
DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Ustawienia gry"
FONT 8, "MS Shell Dlg"
{
LTEXT "Iloœæ rzêdów", IDNONE, 5, 5, 30, 10
LTEXT "IloϾ kolumn", IDNONE, 5, 35, 30, 10
@ -77,14 +77,14 @@ CAPTION "Ustawienia gry"
PUSHBUTTON "Wycofaj", IDCANCEL, 40, 50, 50, 15
}
DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
CAPTION "Winemine - informacje"
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "Na licencji Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -78,8 +78,8 @@ CAPTION "
FONT 8, "MS Shell Dlg"
{
LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "ïîä ëèöåíçèåé Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15
}

View file

@ -76,8 +76,8 @@ CAPTION "
FONT 8, "MS Shell Dlg"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "잃쭙들텃▧韜먹醫系 WINE", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "덧큘", IDOK, 50, 60, 55, 15
}

View file

@ -84,8 +84,8 @@ CAPTION "About"
FONT 8, "MS Shell Dlg"
{
LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10
LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "ïî ë³öåí糿 Wine", IDNONE, 35, 35, 100, 10
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15
}

View file

@ -48,9 +48,9 @@ MENU_WINEMINE MENU DISCARDABLE
}
}
DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 9, "MS Shell Dlg"
FONT 8, "MS Shell Dlg"
CAPTION "扫雷英雄榜"
{
GROUPBOX "最高纪录", IDNONE, 10, 10, 140, 45
@ -66,10 +66,9 @@ CAPTION "ɨ
DEFPUSHBUTTON "确定", IDOK, 55, 60, 50, 15
}
DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 9, "MS Shell Dlg"
DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 8, "MS Shell Dlg"
CAPTION "刷新纪录!"
{
LTEXT "已破纪录,请输入你的名字", IDIGNORE, 10, 10, 150, 10
@ -77,10 +76,9 @@ CAPTION "ˢ
DEFPUSHBUTTON "确定", IDOK, 60, 40, 40, 15
}
DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 9, "MS Shell Dlg"
DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 8, "MS Shell Dlg"
CAPTION "自定义雷区"
{
LTEXT "高度", IDNONE, 5, 5, 30, 10
@ -93,16 +91,14 @@ CAPTION "
PUSHBUTTON "取消", IDCANCEL, 40, 50, 50, 15
}
DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | DS_3DLOOK |
WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 9, "MS Shell Dlg"
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
FONT 8, "MS Shell Dlg"
CAPTION "关于扫雷"
{
LTEXT "Winemine", IDNONE, 10, 10, 35, 10
LTEXT "°æȨ 2000, Joshua Thielen", IDNONE, 35, 20, 100, 10
LTEXT "under the Wine license", IDNONE, 35, 30, 100, 10
//LTEXT "ÖÐÎÄ·­Òë:Õűù\n(ezb@mail.gywb.cn)", IDNONE, 35, 39, 100, 25
ICON "WINEMINE", IDNONE, 10, 25, 20, 20
LTEXT "°æȨ 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10
LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10
ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20
DEFPUSHBUTTON "确定", IDOK, 50, 60, 55, 15
}

View file

@ -56,7 +56,7 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = hInst;
wc.hIcon = LoadIcon( hInst, appname );
wc.hIcon = LoadIcon( hInst, MAKEINTRESOURCE(IDI_WINEMINE) );
wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION );
wc.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
wc.lpszMenuName = "MENU_WINEMINE";