From 107d3b15e1d3c078352060b38f48d20ce16fd95d Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Wed, 5 Dec 2007 23:17:15 +0000 Subject: [PATCH] - Changes by Martin Grogan (groganm AT gmail DOT com, IRC nick _Lazybones_): * Make the appearance and layout more like the MS version * Added functionality for resetting scores * Auto-complete the board, when the player is guaranteed to win - Changes by myself: * Add a new define WINEMINE_REGKEY to define the registry path of the WineMine settings only one time * Store the settings in HKCU instead of HKLM and use REG_DWORD, when it makes sense * Get WineMine to compile warning-free under MSVC * Make the new "seconds" string translateable * Make all WineMine resource files consistent and ensure that all visual elements are visible See issue #2060 for more details. svn path=/trunk/; revision=31032 --- .../base/applications/games/winemine/dialog.c | 57 ++++++- .../applications/games/winemine/lang/bg-BG.rc | 108 +++++++------ .../applications/games/winemine/lang/ca-ES.rc | 100 ++++++------ .../applications/games/winemine/lang/de-DE.rc | 99 ++++++------ .../applications/games/winemine/lang/el-GR.rc | 98 ++++++------ .../applications/games/winemine/lang/en-US.rc | 98 ++++++------ .../applications/games/winemine/lang/es-ES.rc | 100 ++++++------ .../applications/games/winemine/lang/fr-FR.rc | 100 ++++++------ .../applications/games/winemine/lang/id-ID.rc | 97 ++++++------ .../applications/games/winemine/lang/it-IT.rc | 98 ++++++------ .../applications/games/winemine/lang/lt-LT.rc | 99 ++++++------ .../applications/games/winemine/lang/nb-NO.rc | 100 ++++++------ .../applications/games/winemine/lang/nl-NL.rc | 98 ++++++------ .../applications/games/winemine/lang/pl-PL.rc | 99 ++++++------ .../applications/games/winemine/lang/ru-RU.rc | 95 +++++------ .../applications/games/winemine/lang/sk-SK.rc | 103 ++++++------ .../applications/games/winemine/lang/th-TH.rc | 98 ++++++------ .../applications/games/winemine/lang/uk-UA.rc | 100 ++++++------ .../applications/games/winemine/lang/zh-CN.rc | 101 ++++++------ .../base/applications/games/winemine/main.c | 149 +++++++++--------- .../base/applications/games/winemine/main.h | 6 +- .../applications/games/winemine/resource.h | 3 + 22 files changed, 1042 insertions(+), 964 deletions(-) diff --git a/reactos/base/applications/games/winemine/dialog.c b/reactos/base/applications/games/winemine/dialog.c index 2f5bc587e0a..4f9e062252b 100644 --- a/reactos/base/applications/games/winemine/dialog.c +++ b/reactos/base/applications/games/winemine/dialog.c @@ -87,7 +87,12 @@ BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { static BOARD *p_board; + HKEY hkey; unsigned i; + char data[16]; + char key_name[8]; + char times[35]; + char szSeconds[23]; switch( uMsg ) { case WM_INITDIALOG: @@ -98,18 +103,56 @@ BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) SetDlgItemText( hDlg, (IDC_NAME1) + i, p_board->best_name[i] ); /* set best times */ + LoadString( p_board->hInst, IDS_SECONDS, szSeconds, sizeof(szSeconds) ); + for( i = 0; i < 3; i++ ) - SetDlgItemInt( hDlg, (IDC_TIME1) + i, p_board->best_time[i], FALSE ); + { + wsprintf(times, "%d %s", p_board->best_time[i], szSeconds); + SetDlgItemText( hDlg, (IDC_TIME1) + i, times ); + } + return TRUE; case WM_COMMAND: - switch( LOWORD( wParam ) ) { - case IDOK: - case IDCANCEL: - EndDialog( hDlg, 0 ); - return TRUE; + switch( LOWORD( wParam ) ) + { + case IDOK: + case IDCANCEL: + EndDialog( hDlg, 0 ); + return TRUE; + + case IDRESET: + if( RegCreateKeyEx( HKEY_CURRENT_USER, WINEMINE_REGKEY, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) + return TRUE; + + LoadString( p_board->hInst, IDS_SECONDS, szSeconds, sizeof(szSeconds) ); + + for (i = 0; i < 3; i++) + { + p_board->best_time[i] = 999; + wsprintf(p_board->best_name[i], "Nobody"); + wsprintf(times, "%d %s", p_board->best_time[i], szSeconds); + + SetDlgItemText( hDlg, (IDC_NAME1) + i, p_board->best_name[i] ); + SetDlgItemText( hDlg, (IDC_TIME1) + i, times ); + } + + /* write changes to registry */ + for( i = 0; i < 3; i++ ) + { + wsprintf( key_name, "Name%u", i ); + strncpy( data, p_board->best_name[i], sizeof( data ) ); + RegSetValueEx( hkey, key_name, 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); + } + + for( i = 0; i < 3; i++ ) + { + wsprintf( key_name, "Time%u", i ); + RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(DWORD) ); + } + RegCloseKey( hkey ); + return TRUE; } - break; } return FALSE; } diff --git a/reactos/base/applications/games/winemine/lang/bg-BG.rc b/reactos/base/applications/games/winemine/lang/bg-BG.rc index b9514a26416..e6712d7dd2d 100644 --- a/reactos/base/applications/games/winemine/lang/bg-BG.rc +++ b/reactos/base/applications/games/winemine/lang/bg-BG.rc @@ -3,85 +3,83 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "" - + IDS_APPNAME, "" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&" { - MENUITEM "&", IDM_NEW - MENUITEM SEPARATOR - MENUITEM " & (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&", IDM_BEGINNER - MENUITEM "&", IDM_ADVANCED - MENUITEM "&", IDM_EXPERT - MENUITEM "&", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&", IDM_EXIT - } - POPUP "&" { - MENUITEM "&- ", IDM_TIMES - MENUITEM "&", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&", IDM_NEW + MENUITEM SEPARATOR + MENUITEM " & (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&", IDM_BEGINNER + MENUITEM "&", IDM_ADVANCED + MENUITEM "&", IDM_EXPERT + MENUITEM "&", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&- ", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&", IDM_EXIT + } + POPUP "&" { + MENUITEM "&", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "- " FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - GROUPBOX "- ", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "", IDNONE, 20, 30, 40, 8 - LTEXT "", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "", IDOK, 55, 60, 50, 15 + GROUPBOX "- ", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT ":", IDNONE, 20, 30, 58, 8 + LTEXT ":", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - LTEXT " ", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "", IDOK, 60, 40, 40, 15 + LTEXT " ", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - LTEXT "", IDNONE, 5, 5, 30, 10 - LTEXT "", IDNONE, 5, 35, 30, 10 - LTEXT "", 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 - DEFPUSHBUTTON "", IDOK, 40, 30, 50, 15 - PUSHBUTTON "", IDCANCEL, 40, 50, 50, 15 + LTEXT ":", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT ":", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "", IDOK, 86, 32, 45, 15 + PUSHBUTTON "", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 - LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 - ICON "WINEMINE", IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 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 } diff --git a/reactos/base/applications/games/winemine/lang/ca-ES.rc b/reactos/base/applications/games/winemine/lang/ca-ES.rc index e872c8e1abc..0a6dc671207 100644 --- a/reactos/base/applications/games/winemine/lang/ca-ES.rc +++ b/reactos/base/applications/games/winemine/lang/ca-ES.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Cercamines" - + IDS_APPNAME, "Cercamines" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Opcions" { - MENUITEM "&Nou", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "In&terrogant (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Principiant", IDM_BEGINNER - MENUITEM "&Avanat", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Pe&rsonalitzat", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Sortida", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Millors Temps", IDM_TIMES - MENUITEM "En q&uant a", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nou", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "In&terrogant (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Principiant", IDM_BEGINNER + MENUITEM "&Avanat", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "Pe&rsonalitzat", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Millors Temps", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Sortida", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "En q&uant a", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Millors temps" +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Millors Temps" FONT 8, "MS Shell Dlg" { - GROUPBOX "Millors Temps", IDNONE, 10, 10, 140, 45 - LTEXT "Principiant", IDNONE, 20, 20, 40, 8 - LTEXT "Avanat", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Acceptar", IDOK, 55, 60, 50, 15 + GROUPBOX "Millors Temps", IDNONE, 10, 10, 182, 45 + LTEXT "Principiant:", IDNONE, 20, 20, 58, 8 + LTEXT "Avanat:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "Acceptar", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Felicitats!" FONT 8, "MS Shell Dlg" { - LTEXT "Si us plau, entreu el vostre nom", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Acceptar", IDOK, 60, 40, 40, 15 + LTEXT "Si us plau, entreu el vostre nom", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Acceptar", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Joc Personalitzat" FONT 8, "MS Shell Dlg" { - LTEXT "Files", IDNONE, 5, 5, 30, 10 - LTEXT "Columnes", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", 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 - DEFPUSHBUTTON "Acceptar", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancellar", IDCANCEL, 40, 50, 50, 15 + LTEXT "Files:", IDNONE, 5, 15, 43, 10 + LTEXT "Columnes:", IDNONE, 5, 35, 43, 10 + LTEXT "Mines:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "Acceptar", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Cancellar", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "En quant a" FONT 8, "MS Shell Dlg" { - LTEXT "Cercamines", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "sota llicncia Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Acceptar", IDOK, 50, 60, 55, 15 + LTEXT "Cercamines", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "sota llicncia Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Acceptar", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/de-DE.rc b/reactos/base/applications/games/winemine/lang/de-DE.rc index dfc14442004..91426a6bb2d 100644 --- a/reactos/base/applications/games/winemine/lang/de-DE.rc +++ b/reactos/base/applications/games/winemine/lang/de-DE.rc @@ -3,45 +3,48 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "WineMine" + IDS_APPNAME, "WineMine" + IDS_SECONDS, "Sekunden" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Optionen" { - MENUITEM "&Neu", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Merker (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Anfnger", IDM_BEGINNER - MENUITEM "&Fortgeschrittene", IDM_ADVANCED - MENUITEM "&Experten", IDM_EXPERT - MENUITEM "&Benutzerdefiniert", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "Beenden", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Bestzeiten", IDM_TIMES - MENUITEM "&ber", IDM_ABOUT - } + POPUP "&Spiel" { + MENUITEM "&Neu", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Merker (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Anfnger", IDM_BEGINNER + MENUITEM "&Fortgeschrittene", IDM_ADVANCED + MENUITEM "&Profis", IDM_EXPERT + MENUITEM "&Benutzerdefiniert...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Bestzeiten", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "Beenden", IDM_EXIT + } + POPUP "&?" { + MENUITEM "&Info...", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Bestzeiten" FONT 8, "MS Shell Dlg" { - GROUPBOX "Bestzeiten", IDNONE, 10, 10, 140, 45 - LTEXT "Anfnger", IDNONE, 20, 20, 40, 8 - LTEXT "Fortgeschrittene", IDNONE, 20, 30, 40, 8 - LTEXT "Experten", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Bestzeiten", IDNONE, 10, 10, 182, 45 + LTEXT "Anfnger:", IDNONE, 20, 20, 58, 8 + LTEXT "Fortgeschrittene:", IDNONE, 20, 30, 58, 8 + LTEXT "Profis:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "Bestzeiten &lschen", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -49,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Glckwunsch!" FONT 8, "MS Shell Dlg" { - LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 + LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Benutzerdefiniertes Spiel" +CAPTION "Custom Game" FONT 8, "MS Shell Dlg" { - LTEXT "Zeilen", IDNONE, 5, 5, 30, 10 - LTEXT "Spalten", IDNONE, 5, 35, 30, 10 - LTEXT "Minen", 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 - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Abbrechen", IDCANCEL, 40, 50, 50, 15 + LTEXT "Hhe:", IDNONE, 5, 15, 43, 10 + LTEXT "Breite:", IDNONE, 5, 35, 43, 10 + LTEXT "Minen:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -74,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "ber" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "Unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "Unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/el-GR.rc b/reactos/base/applications/games/winemine/lang/el-GR.rc index ba88c89cb3e..259553ff25d 100644 --- a/reactos/base/applications/games/winemine/lang/el-GR.rc +++ b/reactos/base/applications/games/winemine/lang/el-GR.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "" - + IDS_APPNAME, "" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&" { - MENUITEM "&", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "& ", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&", IDM_BEGINNER - MENUITEM "&", IDM_ADVANCED - MENUITEM "&", IDM_EXPERT - MENUITEM "&", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&", IDM_EXIT - } - POPUP "&" { - MENUITEM "& ", IDM_TIMES - MENUITEM "&...", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "& ", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&", IDM_BEGINNER + MENUITEM "&", IDM_ADVANCED + MENUITEM "&", IDM_EXPERT + MENUITEM "&", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "& ", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&", IDM_EXIT + } + POPUP "&" { + MENUITEM "&...", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" { - GROUPBOX " ", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "", IDNONE, 20, 30, 40, 8 - LTEXT "", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX " ", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT ":", IDNONE, 20, 30, 58, 8 + LTEXT ":", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "O", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "!" FONT 8, "MS Shell Dlg" { - LTEXT " ", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "O", IDOK, 60, 40, 40, 15 + LTEXT " ", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "O", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 5, 5, 30, 10 - LTEXT "", IDNONE, 5, 35, 30, 10 - LTEXT "", 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 - DEFPUSHBUTTON "O", IDOK, 40, 30, 50, 15 - PUSHBUTTON "", IDCANCEL, 40, 50, 50, 15 + LTEXT ":", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT ":", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "O", IDOK, 86, 32, 45, 15 + PUSHBUTTON "", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "..." FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 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 "Ok", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 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 "O", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/en-US.rc b/reactos/base/applications/games/winemine/lang/en-US.rc index 71b1145a16f..eacfcb2d059 100644 --- a/reactos/base/applications/games/winemine/lang/en-US.rc +++ b/reactos/base/applications/games/winemine/lang/en-US.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Options" { - MENUITEM "&New", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Mark Question", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Beginner", IDM_BEGINNER - MENUITEM "&Advanced", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Custom", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Fastest Times", IDM_TIMES - MENUITEM "&About", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&New", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Marks (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Beginner", IDM_BEGINNER + MENUITEM "&Intermediate", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Custom...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Best Times...", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + } + POPUP "&Help" { + MENUITEM "&About", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Fastest Times" FONT 8, "MS Shell Dlg" { - GROUPBOX "Fastest Times", IDNONE, 10, 10, 140, 45 - LTEXT "Beginner", IDNONE, 20, 20, 40, 8 - LTEXT "Advanced", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Fastest Times", IDNONE, 10, 10, 182, 45 + LTEXT "Beginner:", IDNONE, 20, 20, 58, 8 + LTEXT "Intermediate:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Congratulations!" FONT 8, "MS Shell Dlg" { - LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Custom Game" FONT 8, "MS Shell Dlg" { - LTEXT "Rows", IDNONE, 5, 5, 30, 10 - LTEXT "Cols", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 + LTEXT "Height:", IDNONE, 5, 15, 43, 10 + LTEXT "Width:", IDNONE, 5, 35, 43, 10 + LTEXT "Mines:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Cancel", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "About" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 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 "Ok", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 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 "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/es-ES.rc b/reactos/base/applications/games/winemine/lang/es-ES.rc index a90ee0fabd1..b482d82403a 100644 --- a/reactos/base/applications/games/winemine/lang/es-ES.rc +++ b/reactos/base/applications/games/winemine/lang/es-ES.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Opciones" { - MENUITEM "&Nuevo", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Marcar Interrogantes", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Principiante", IDM_BEGINNER - MENUITEM "&Advanzado", IDM_ADVANCED - MENUITEM "&Experto", IDM_EXPERT - MENUITEM "&Juego Personalizado", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Salir", IDM_EXIT - } - POPUP "&Informacin" { - MENUITEM "&Mejores Tiempos", IDM_TIMES - MENUITEM "&Acerca de", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nuevo", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Marcar Interrogantes", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Principiante", IDM_BEGINNER + MENUITEM "&Advanzado", IDM_ADVANCED + MENUITEM "&Experto", IDM_EXPERT + MENUITEM "&Juego Personalizado", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Mejores Tiempos", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Salir", IDM_EXIT + } + POPUP "&Informacin" { + MENUITEM "&Acerca de", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Fastest Times" +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Mejores Tiempos" FONT 8, "MS Shell Dlg" { - GROUPBOX "Mejores Tiempos", IDNONE, 10, 10, 140, 45 - LTEXT "Principiante", IDNONE, 20, 20, 40, 8 - LTEXT "Advanzado", IDNONE, 20, 30, 40, 8 - LTEXT "Experto", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Aceptar", IDOK, 55, 60, 50, 15 + GROUPBOX "Mejores Tiempos", IDNONE, 10, 10, 182, 45 + LTEXT "Principiante:", IDNONE, 20, 20, 58, 8 + LTEXT "Advanzado:", IDNONE, 20, 30, 58, 8 + LTEXT "Experto:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "Aceptar", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Felicidades!" FONT 8, "MS Shell Dlg" { - LTEXT "Por Favor, introduce tu nombre", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Aceptar", IDOK, 60, 40, 40, 15 + LTEXT "Por Favor, introduce tu nombre", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Aceptar", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Juego Personalizado" FONT 8, "MS Shell Dlg" { - LTEXT "Filas", IDNONE, 5, 5, 30, 10 - LTEXT "Columnas", IDNONE, 5, 35, 30, 10 - LTEXT "Minas", 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 - DEFPUSHBUTTON "Aceptar", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancelar", IDCANCEL, 40, 50, 50, 15 + LTEXT "Filas:", IDNONE, 5, 15, 43, 10 + LTEXT "Columnas:", IDNONE, 5, 35, 43, 10 + LTEXT "Minas:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "Aceptar", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Cancel", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Acerca de" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 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 "Aceptar", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 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 "Aceptar", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/fr-FR.rc b/reactos/base/applications/games/winemine/lang/fr-FR.rc index 3921792727b..8ad7e944e2b 100644 --- a/reactos/base/applications/games/winemine/lang/fr-FR.rc +++ b/reactos/base/applications/games/winemine/lang/fr-FR.rc @@ -9,46 +9,49 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Options" { - MENUITEM "&Nouveau", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Marqueur ?", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Dbutant", IDM_BEGINNER - MENUITEM "&Amateur", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Sur mesure", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Quitter", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Temps acclr", IDM_TIMES - MENUITEM "& propos", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nouveau", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Marqueur ?", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Dbutant", IDM_BEGINNER + MENUITEM "&Amateur", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Sur mesure", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Temps acclr", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Temps acclr", IDM_TIMES + MENUITEM "& propos", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Temps acclr" FONT 8, "MS Shell Dlg" { - GROUPBOX "Temps acclr", IDNONE, 10, 10, 140, 45 - LTEXT "Dbutant", IDNONE, 20, 20, 40, 8 - LTEXT "Amateur", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Temps acclr", IDNONE, 10, 10, 182, 45 + LTEXT "Dbutant:", IDNONE, 20, 20, 58, 8 + LTEXT "Amateur:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -56,24 +59,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Flicitations !" FONT 8, "MS Shell Dlg" { - LTEXT "Veuillez entrer votre nom :", IDNONE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Veuillez entrer votre nom :", IDNONE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Sur mesure" FONT 8, "MS Shell Dlg" { - LTEXT "Lignes", IDNONE, 5, 5, 30, 10 - LTEXT "Colonnes", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Annuler", IDCANCEL, 40, 50, 50, 15 + LTEXT "Lignes:", IDNONE, 5, 15, 43, 10 + LTEXT "Colonnes:", IDNONE, 5, 35, 43, 10 + LTEXT "Mines:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Annuler", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -81,10 +84,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION " propos" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "Sous licence Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "Sous licence Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } - diff --git a/reactos/base/applications/games/winemine/lang/id-ID.rc b/reactos/base/applications/games/winemine/lang/id-ID.rc index 3331518574c..60edf66d975 100644 --- a/reactos/base/applications/games/winemine/lang/id-ID.rc +++ b/reactos/base/applications/games/winemine/lang/id-ID.rc @@ -3,45 +3,48 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Opsi" { - MENUITEM "&Baru", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Tandai Pertanyaan", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Pemula", IDM_BEGINNER - MENUITEM "&Lanjutan", IDM_ADVANCED - MENUITEM "&Ahli", IDM_EXPERT - MENUITEM "&Kustom", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Waktu Tercepat", IDM_TIMES - MENUITEM "&Tentang", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Baru", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Tandai Pertanyaan", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Pemula", IDM_BEGINNER + MENUITEM "&Lanjutan", IDM_ADVANCED + MENUITEM "&Ahli", IDM_EXPERT + MENUITEM "&Kustom", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Waktu Tercepat", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Tentang", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Waktu Tercepat" FONT 8, "MS Shell Dlg" { - GROUPBOX "Waktu Tercepat", IDNONE, 10, 10, 140, 45 - LTEXT "Pemula", IDNONE, 20, 20, 40, 8 - LTEXT "Lanjutan", IDNONE, 20, 30, 40, 8 - LTEXT "Ahli", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Waktu Tercepat", IDNONE, 10, 10, 182, 45 + LTEXT "Pemula:", IDNONE, 20, 20, 58, 8 + LTEXT "Lanjutan:", IDNONE, 20, 30, 58, 8 + LTEXT "Ahli:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -49,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Selamat!" FONT 8, "MS Shell Dlg" { - LTEXT "Silahkan masukkan nama anda", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Silahkan masukkan nama anda", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Game Kustom" FONT 8, "MS Shell Dlg" { - LTEXT "Baris", IDNONE, 5, 5, 30, 10 - LTEXT "Kolom", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Batal", IDCANCEL, 40, 50, 50, 15 + LTEXT "Baris:", IDNONE, 5, 15, 43, 10 + LTEXT "Kolom:", IDNONE, 5, 35, 43, 10 + LTEXT "Mines:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Batal", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -74,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Tentang" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "di bawah lisensi Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "di bawah lisensi Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/it-IT.rc b/reactos/base/applications/games/winemine/lang/it-IT.rc index df1872a4588..44ca4f9472d 100644 --- a/reactos/base/applications/games/winemine/lang/it-IT.rc +++ b/reactos/base/applications/games/winemine/lang/it-IT.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "Campo minato" - + IDS_APPNAME, "Campo minato" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Partita" { - MENUITEM "&Nuova", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Segno (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Principiante", IDM_BEGINNER - MENUITEM "&Intermedio", IDM_ADVANCED - MENUITEM "Espe&rto", IDM_EXPERT - MENUITEM "Personali&zza", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Esci", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Tempi migliori", IDM_TIMES - MENUITEM "&Informazioni su Campo minato", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nuova", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Segno (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Principiante", IDM_BEGINNER + MENUITEM "&Intermedio", IDM_ADVANCED + MENUITEM "Espe&rto", IDM_EXPERT + MENUITEM "Personali&zza", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Tempi migliori", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Esci", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Informazioni su Campo minato", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Tempi migliori" FONT 8, "MS Shell Dlg" { - GROUPBOX "Tempi migliori", IDNONE, 10, 10, 140, 45 - LTEXT "Principiante", IDNONE, 20, 20, 40, 8 - LTEXT "Intermedio", IDNONE, 20, 30, 40, 8 - LTEXT "Esperto", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Tempi migliori", IDNONE, 10, 10, 182, 45 + LTEXT "Principiante:", IDNONE, 20, 20, 58, 8 + LTEXT "Intermedio:", IDNONE, 20, 30, 58, 8 + LTEXT "Esperto:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Complimenti!" FONT 8, "MS Shell Dlg" { - LTEXT "Digita il tuo nome per favore", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Digita il tuo nome per favore", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Campo personalizzato" FONT 8, "MS Shell Dlg" { - LTEXT "Righe", IDNONE, 5, 5, 30, 10 - LTEXT "Colonne", IDNONE, 5, 35, 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Annulla", IDCANCEL, 40, 50, 50, 15 + LTEXT "Righe:", IDNONE, 5, 15, 43, 10 + LTEXT "Colonne:", IDNONE, 5, 35, 43, 10 + LTEXT "Mine:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Annulla", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Informazioni su Campo minato" FONT 8, "MS Shell Dlg" { - 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 + 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 } diff --git a/reactos/base/applications/games/winemine/lang/lt-LT.rc b/reactos/base/applications/games/winemine/lang/lt-LT.rc index 2fb13d4674e..9d8152fd3aa 100644 --- a/reactos/base/applications/games/winemine/lang/lt-LT.rc +++ b/reactos/base/applications/games/winemine/lang/lt-LT.rc @@ -5,46 +5,49 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&aidimas" { - MENUITEM "&Naujas aidimas", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "ymti &spjamus (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Pradedantis", IDM_BEGINNER - MENUITEM "Pa&engs", IDM_ADVANCED - MENUITEM "&Ekspertas", IDM_EXPERT - MENUITEM "Pasi&rinktas", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Baigti", IDM_EXIT - } - POPUP "&Informacija" { - MENUITEM "&Greiiausi laikai", IDM_TIMES - MENUITEM "&Apie", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Naujas aidimas", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "ymti &spjamus (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Pradedantis", IDM_BEGINNER + MENUITEM "Pa&engs", IDM_ADVANCED + MENUITEM "&Ekspertas", IDM_EXPERT + MENUITEM "Pasi&rinktas", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Greiiausi laikai", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Baigti", IDM_EXIT + } + POPUP "&Informacija" { + + MENUITEM "&Apie", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Greiiausi laikai" FONT 8, "MS Shell Dlg" { - GROUPBOX "Greiiausi laikai", IDNONE, 10, 10, 140, 45 - LTEXT "Pradedantis", IDNONE, 20, 20, 40, 8 - LTEXT "Paengs", IDNONE, 20, 30, 40, 8 - LTEXT "Ekspertas", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Greiiausi laikai", IDNONE, 10, 10, 182, 45 + LTEXT "Pradedantis:", IDNONE, 20, 20, 58, 8 + LTEXT "Paengs:", IDNONE, 20, 30, 58, 8 + LTEXT "Ekspertas:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -52,24 +55,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Sveikiname!" FONT 8, "MS Shell Dlg" { - LTEXT "Praome rayti savo vard", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 + LTEXT "Praome rayti savo vard", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Pasirinktas aidimas" FONT 8, "MS Shell Dlg" { - LTEXT "Eiluts", IDNONE, 5, 5, 30, 10 - LTEXT "Stulpeliai", IDNONE, 5, 35, 30, 10 - LTEXT "Minos", 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 - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Ataukti", IDCANCEL, 40, 50, 50, 15 + LTEXT "Eiluts:", IDNONE, 5, 15, 43, 10 + LTEXT "Stulpeliai:", IDNONE, 5, 35, 43, 10 + LTEXT "Minos:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Ataukti", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -77,9 +80,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Apie" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 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 "OK", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 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 "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/nb-NO.rc b/reactos/base/applications/games/winemine/lang/nb-NO.rc index 4b29d645e6f..468b414f7b8 100644 --- a/reactos/base/applications/games/winemine/lang/nb-NO.rc +++ b/reactos/base/applications/games/winemine/lang/nb-NO.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "Minesveiper" - + IDS_APPNAME, "Minesveiper" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Valg" { - MENUITEM "&Nytt", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Merk sprsml", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Nybegynner", IDM_BEGINNER - MENUITEM "&Avansert", IDM_ADVANCED - MENUITEM "&Ekspert", IDM_EXPERT - MENUITEM "&Egendefinert", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "A&vslutt", IDM_EXIT - } - POPUP "&Informasjon" { - MENUITEM "&Beste tider", IDM_TIMES - MENUITEM "&Om", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nytt", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Merk sprsml", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Nybegynner", IDM_BEGINNER + MENUITEM "&Avansert", IDM_ADVANCED + MENUITEM "&Ekspert", IDM_EXPERT + MENUITEM "&Egendefinert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Beste tider", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDM_EXIT + } + POPUP "&Informasjon" { + MENUITEM "&Om", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +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 - LTEXT "Avansert", IDNONE, 20, 30, 40, 8 - LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Beste tider", IDNONE, 10, 10, 182, 45 + LTEXT "Nybegynner:", IDNONE, 20, 20, 58, 8 + LTEXT "Avansert:", IDNONE, 20, 30, 58, 8 + LTEXT "Ekspert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL 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 + 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 DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Egendefinert spill" +CAPTION "Custom Game" FONT 8, "MS Shell Dlg" { - LTEXT "Hyde", IDNONE, 5, 5, 30, 10 - LTEXT "Bredde", IDNONE, 5, 35, 30, 10 - LTEXT "Miner", 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 + LTEXT "Hyde:", IDNONE, 5, 15, 43, 10 + LTEXT "Bredde:", IDNONE, 5, 35, 43, 10 + LTEXT "Miner:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Om" FONT 8, "MS Shell Dlg" { - LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/nl-NL.rc b/reactos/base/applications/games/winemine/lang/nl-NL.rc index 445af684ed1..a640d7e7eeb 100644 --- a/reactos/base/applications/games/winemine/lang/nl-NL.rc +++ b/reactos/base/applications/games/winemine/lang/nl-NL.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Optie's" { - MENUITEM "&Nieuw", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "Vraagteken a&ctiveren", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Beginner", IDM_BEGINNER - MENUITEM "&Gevorderde", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Aan&passen", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Afsluiten", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "Bes&te tijd", IDM_TIMES - MENUITEM "&Over", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nieuw", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "Vraagteken a&ctiveren", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Beginner", IDM_BEGINNER + MENUITEM "&Gevorderde", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "Aan&passen", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "Bes&te tijd", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Over", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Beste tijd" FONT 8, "MS Shell Dlg" { - GROUPBOX "Beste tijd", IDNONE, 10, 10, 140, 45 - LTEXT "Beginner", IDNONE, 20, 20, 40, 8 - LTEXT "Gevorderde", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Beste tijd", IDNONE, 10, 10, 182, 45 + LTEXT "Beginner:", IDNONE, 20, 20, 58, 8 + LTEXT "Gevorderde:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Gefeleciteerd!" FONT 8, "MS Shell Dlg" { - LTEXT "Gelieve uw naam in te voeren", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Gelieve uw naam in te voeren", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Aangepast spel" FONT 8, "MS Shell Dlg" { - LTEXT "Rijen", IDNONE, 5, 5, 30, 10 - LTEXT "Kolommen", IDNONE, 5, 35, 30, 10 - LTEXT "Mijnen", 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 - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Annuleren", IDCANCEL, 40, 50, 50, 15 + LTEXT "Rijen:", IDNONE, 5, 15, 43, 10 + LTEXT "Kolommen:", IDNONE, 5, 35, 43, 10 + LTEXT "Mijnen:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Annuleren", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Over" FONT 8, "MS Shell Dlg" { - LTEXT "WineMine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "onder de Wine licentie", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "onder de Wine licentie", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/pl-PL.rc b/reactos/base/applications/games/winemine/lang/pl-PL.rc index 75faf8ab452..8c00eb1356f 100644 --- a/reactos/base/applications/games/winemine/lang/pl-PL.rc +++ b/reactos/base/applications/games/winemine/lang/pl-PL.rc @@ -10,46 +10,49 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Saper" - + IDS_APPNAME, "Saper" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Opcje" { - MENUITEM "&Nowa gra", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "Poz&iom", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Pocztkujcy", IDM_BEGINNER - MENUITEM "Z&aawansowany", IDM_ADVANCED - MENUITEM "&Ekspert", IDM_EXPERT - MENUITEM "&Wasny poziom", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Zamknij", IDM_EXIT - } - POPUP "&Informacje" { - MENUITEM "N&ajlepsze czasy", IDM_TIMES - MENUITEM "&Winemine - informacje", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nowa gra", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "Poz&iom", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Pocztkujcy", IDM_BEGINNER + MENUITEM "Z&aawansowany", IDM_ADVANCED + MENUITEM "&Ekspert", IDM_EXPERT + MENUITEM "&Wasny poziom", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "N&ajlepsze czasy", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Zamknij", IDM_EXIT + } + POPUP "&Informacje" { + MENUITEM "N&ajlepsze czasy", IDM_TIMES + MENUITEM "&WineMine - informacje", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +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 "Pocztkujcy", IDNONE, 20, 20, 40, 8 - LTEXT "Zaawansowany", IDNONE, 20, 30, 40, 8 - LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Najlepsze czasy", IDNONE, 10, 10, 182, 45 + LTEXT "Pocztkujcy:", IDNONE, 20, 20, 58, 8 + LTEXT "Zaawansowany:", IDNONE, 20, 30, 58, 8 + LTEXT "Ekspert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -57,24 +60,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL 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 + 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 DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ustawienia gry" FONT 8, "MS Shell Dlg" { - LTEXT "Ilo rzdw", IDNONE, 5, 5, 30, 10 - LTEXT "Ilo kolumn", IDNONE, 5, 35, 30, 10 - LTEXT "Ilo min", 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 - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Anuluj", IDCANCEL, 40, 50, 50, 15 + LTEXT "Ilo rzdw:", IDNONE, 5, 15, 43, 10 + LTEXT "Ilo kolumn:", IDNONE, 5, 35, 43, 10 + LTEXT "Ilo min:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Anuluj", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -82,9 +85,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Winemine - informacje" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "Na licencji Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "Na licencji Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/ru-RU.rc b/reactos/base/applications/games/winemine/lang/ru-RU.rc index e0ea2155b68..ecda741f277 100644 --- a/reactos/base/applications/games/winemine/lang/ru-RU.rc +++ b/reactos/base/applications/games/winemine/lang/ru-RU.rc @@ -6,45 +6,48 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "" + IDS_APPNAME, "" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&" { - MENUITEM "& ", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&", IDM_BEGINNER - MENUITEM "&", IDM_ADVANCED - MENUITEM "&", IDM_EXPERT - MENUITEM "&...", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&", IDM_EXIT - } - POPUP "&" { - MENUITEM "& ", IDM_TIMES - MENUITEM "& ", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "& ", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&", IDM_BEGINNER + MENUITEM "&", IDM_ADVANCED + MENUITEM "&", IDM_EXPERT + MENUITEM "&...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "& ", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&", IDM_EXIT + } + POPUP "&" { + MENUITEM "& ", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" { - GROUPBOX " ", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "", IDNONE, 20, 30, 40, 8 - LTEXT "", IDNONE, 20, 40, 51, 8 - LTEXT "999", IDC_TIME1, 74, 20, 15, 8 - LTEXT "999", IDC_TIME2, 74, 30, 15, 8 - LTEXT "999", IDC_TIME3, 74, 40, 15, 8 - LTEXT "", IDC_NAME1, 94, 20, 55, 8 - LTEXT "", IDC_NAME2, 94, 30, 55, 8 - LTEXT "", IDC_NAME3, 94, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX " ", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT ":", IDNONE, 20, 30, 58, 8 + LTEXT ":", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -52,24 +55,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "!" FONT 8, "MS Shell Dlg" { - LTEXT " ", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 + LTEXT " ", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 5, 5, 30, 10 - LTEXT "", IDNONE, 5, 35, 30, 10 - LTEXT " ", IDNONE, 5, 65, 36, 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 - DEFPUSHBUTTON "OK", IDOK, 45, 30, 50, 15 - PUSHBUTTON "", IDCANCEL, 45, 50, 50, 15 + LTEXT ":", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT " :", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -77,9 +80,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION " " FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 10, 10, 35, 10 + LTEXT "", IDNONE, 10, 10, 35, 10 LTEXT " () 2000,\n .", IDNONE, 35, 25, 110, 17 - LTEXT " Wine", IDNONE, 35, 42, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT " Wine", IDNONE, 35, 42, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/sk-SK.rc b/reactos/base/applications/games/winemine/lang/sk-SK.rc index 8d61b351d87..80714def5cb 100644 --- a/reactos/base/applications/games/winemine/lang/sk-SK.rc +++ b/reactos/base/applications/games/winemine/lang/sk-SK.rc @@ -7,46 +7,48 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Mny" - + IDS_APPNAME, "Mny" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Monosti" { - MENUITEM "&Nov hra", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "Zn&aky (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Zaiatonk", IDM_BEGINNER - MENUITEM "&Pokroil", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Vlastn...", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "Sk&oni", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Najlepie asy...", IDM_TIMES - MENUITEM "&o je hra Mny...", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&Nov hra", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "Zn&aky (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Zaiatonk", IDM_BEGINNER + MENUITEM "&Pokroil", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Vlastn...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Najlepie asy...", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "Sk&oni", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&o je hra Mny...", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Najrchlej hadai mn" FONT 8, "MS Shell Dlg" { - GROUPBOX "Najlepie asy", IDNONE, 10, 10, 140, 45 - LTEXT "Zaiatonk", IDNONE, 20, 20, 40, 8 - LTEXT "Pokroil", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX "Najlepie asy", IDNONE, 10, 10, 182, 45 + LTEXT "Zaiatonk:", IDNONE, 20, 20, 58, 8 + LTEXT "Pokroil:", IDNONE, 20, 30, 58, 8 + LTEXT "Expert:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -54,34 +56,35 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "Blahoelm!" FONT 8, "MS Shell Dlg" { - LTEXT "Zadajte svoje meno, prosm!", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + LTEXT "Zadajte svoje meno, prosm!", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Vlastn pole" +CAPTION "Custom Game" FONT 8, "MS Shell Dlg" { - LTEXT "Vka", IDNONE, 5, 5, 30, 10 - LTEXT "rka", IDNONE, 5, 35, 30, 10 - LTEXT "Mny", 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 - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Zrui", IDCANCEL, 40, 50, 50, 15 + LTEXT "Vka:", IDNONE, 5, 15, 43, 10 + LTEXT "rka:", IDNONE, 5, 35, 43, 10 + LTEXT "Mny:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Zrui", IDCANCEL, 86, 52, 45, 15 } + DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "o je hra Mny (WineMine)" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "pod licenciou Wine", IDNONE, 35, 35, 100, 10 - LTEXT "Preloil Kario", IDNONE, 35, 45, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "pod licenciou Wine", IDNONE, 35, 35, 100, 10 + LTEXT "Preloil Kario", IDNONE, 35, 45, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/th-TH.rc b/reactos/base/applications/games/winemine/lang/th-TH.rc index f38710b9831..5e20e340958 100644 --- a/reactos/base/applications/games/winemine/lang/th-TH.rc +++ b/reactos/base/applications/games/winemine/lang/th-TH.rc @@ -3,46 +3,48 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" - + IDS_APPNAME, "WineMine" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&͡" { - MENUITEM "&", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&ͧ¤Ӷ", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&", IDM_BEGINNER - MENUITEM "&٧", IDM_ADVANCED - MENUITEM "&ӹҭ", IDM_EXPERT - MENUITEM "&", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&͡", IDM_EXIT - } - POPUP "&Һ" { - MENUITEM "&ҷǷش", IDM_TIMES - MENUITEM "&ǡѺ", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&ͧ¤Ӷ", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&", IDM_BEGINNER + MENUITEM "&٧", IDM_ADVANCED + MENUITEM "&ӹҭ", IDM_EXPERT + MENUITEM "&", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&ҷǷش", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&͡", IDM_EXIT + } + POPUP "&Һ" { + MENUITEM "&ǡѺ", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "ҷǷش" FONT 8, "MS Shell Dlg" { - GROUPBOX "ҷǷش", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "٧", IDNONE, 20, 30, 40, 8 - LTEXT "ӹҭ", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "ŧ", IDOK, 55, 60, 50, 15 + GROUPBOX "ҷǷش", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT "٧:", IDNONE, 20, 30, 58, 8 + LTEXT "ӹҭ:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "ŧ", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -50,24 +52,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "ʴԹմ!" FONT 8, "MS Shell Dlg" { - LTEXT "ôͧ͢͡س", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "ŧ", IDOK, 60, 40, 40, 15 + LTEXT "ôͧ͢͡س", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "ŧ", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "дѺ" FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 5, 5, 30, 10 - LTEXT "ѡ", IDNONE, 5, 35, 30, 10 - LTEXT "ѺԴ", 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 - DEFPUSHBUTTON "ŧ", IDOK, 40, 30, 50, 15 - PUSHBUTTON "¡ԡ", IDCANCEL, 40, 50, 50, 15 + LTEXT ":", IDNONE, 5, 15, 43, 10 + LTEXT "ѡ:", IDNONE, 5, 35, 43, 10 + LTEXT "ѺԴ:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "ŧ", IDOK, 86, 32, 45, 15 + PUSHBUTTON "¡ԡ", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -75,9 +77,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "ǡѺ" FONT 8, "MS Shell Dlg" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "ԢԷͧ WINE", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "ŧ", IDOK, 50, 60, 55, 15 + LTEXT "WineMine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT "ԢԷͧ WINE", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "ŧ", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/uk-UA.rc b/reactos/base/applications/games/winemine/lang/uk-UA.rc index 183cd765522..7a482d767b3 100644 --- a/reactos/base/applications/games/winemine/lang/uk-UA.rc +++ b/reactos/base/applications/games/winemine/lang/uk-UA.rc @@ -11,46 +11,48 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "" - + IDS_APPNAME, "" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&" { - MENUITEM "&", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&̳ (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&", IDM_BEGINNER - MENUITEM "&", IDM_ADVANCED - MENUITEM "&", IDM_EXPERT - MENUITEM "&", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&", IDM_EXIT - } - POPUP "&" { - MENUITEM "& ", IDM_TIMES - MENUITEM "&", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "&", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&̳ (?)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&", IDM_BEGINNER + MENUITEM "&", IDM_ADVANCED + MENUITEM "&", IDM_EXPERT + MENUITEM "&", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "& ", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&", IDM_EXIT + } + POPUP "&" { + MENUITEM "&", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION " " FONT 8, "MS Shell Dlg" { - GROUPBOX " ", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "", IDNONE, 20, 30, 40, 8 - LTEXT "", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + GROUPBOX " ", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT ":", IDNONE, 20, 30, 58, 8 + LTEXT ":", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -58,24 +60,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "³!" FONT 8, "MS Shell Dlg" { - LTEXT " '", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 + LTEXT " '", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION " " +CAPTION "Custom Game" FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 5, 5, 30, 10 - LTEXT "", IDNONE, 5, 35, 30, 10 - LTEXT "̳", 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 - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "", IDCANCEL, 40, 50, 50, 15 + LTEXT ":", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT "̳:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15 + PUSHBUTTON "", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -83,9 +85,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL CAPTION "About" FONT 8, "MS Shell Dlg" { - LTEXT "", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT " 糿 Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 + LTEXT "", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 + LTEXT " 糿 Wine", IDNONE, 35, 35, 100, 10 + ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 55, 15 } diff --git a/reactos/base/applications/games/winemine/lang/zh-CN.rc b/reactos/base/applications/games/winemine/lang/zh-CN.rc index 04317276c22..15b9ba354a2 100644 --- a/reactos/base/applications/games/winemine/lang/zh-CN.rc +++ b/reactos/base/applications/games/winemine/lang/zh-CN.rc @@ -24,46 +24,47 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE DISCARDABLE { - IDS_APPNAME, "ɨ" - + IDS_APPNAME, "ɨ" + IDS_SECONDS, "seconds" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "Ϸ(&O)" { - MENUITEM "(&N)", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "(?)(&M)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "(&B)", IDM_BEGINNER - MENUITEM "м(&A)", IDM_ADVANCED - MENUITEM "߼(&E)", IDM_EXPERT - MENUITEM "Զ(&C)...", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "˳(&X)", IDM_EXIT - } - POPUP "Ϣ(&I)" { - MENUITEM "ɨӢ۰(&F)...", IDM_TIMES - MENUITEM "ɨ(&A)...", IDM_ABOUT - } + POPUP "&Game" { + MENUITEM "(&N)", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "(?)(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "(&B)", IDM_BEGINNER + MENUITEM "м(&A)", IDM_ADVANCED + MENUITEM "߼(&E)", IDM_EXPERT + MENUITEM "Զ(&C)...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "˳(&X)", IDM_EXIT + } + POPUP "Ϣ(&I)" { + MENUITEM "ɨӢ۰(&F)...", IDM_TIMES + MENUITEM "ɨ(&A)...", IDM_ABOUT + } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 8, "MS Shell Dlg" +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "ɨӢ۰" +FONT 8, "MS Shell Dlg" { - GROUPBOX "߼¼", IDNONE, 10, 10, 140, 45 - LTEXT "", IDNONE, 20, 20, 40, 8 - LTEXT "м", IDNONE, 20, 30, 40, 8 - LTEXT "߼", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "ȷ", IDOK, 55, 60, 50, 15 + GROUPBOX "߼¼", IDNONE, 10, 10, 182, 45 + LTEXT ":", IDNONE, 20, 20, 58, 8 + LTEXT "м:", IDNONE, 20, 30, 58, 8 + LTEXT "߼:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "ȷ", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 @@ -71,24 +72,24 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL FONT 8, "MS Shell Dlg" CAPTION "ˢ¼¼!" { - LTEXT "Ƽ¼,", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "ȷ", IDOK, 60, 40, 40, 15 + LTEXT "Ƽ¼,", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "ȷ", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -FONT 8, "MS Shell Dlg" CAPTION "Զ" +FONT 8, "MS Shell Dlg" { - LTEXT "߶", IDNONE, 5, 5, 30, 10 - LTEXT "", IDNONE, 5, 35, 30, 10 - LTEXT "", 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 - DEFPUSHBUTTON "ȷ", IDOK, 40, 30, 50, 15 - PUSHBUTTON "ȡ", IDCANCEL, 40, 50, 50, 15 + LTEXT "߶:", IDNONE, 5, 15, 43, 10 + LTEXT ":", IDNONE, 5, 35, 43, 10 + LTEXT ":", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "ȷ", IDOK, 86, 32, 45, 15 + PUSHBUTTON "ȡ", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 @@ -96,9 +97,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL FONT 8, "MS Shell Dlg" CAPTION "ɨ" { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 - 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 + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + 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 } diff --git a/reactos/base/applications/games/winemine/main.c b/reactos/base/applications/games/winemine/main.c index 22d5b01b63d..3b1ad469951 100644 --- a/reactos/base/applications/games/winemine/main.c +++ b/reactos/base/applications/games/winemine/main.c @@ -262,32 +262,31 @@ void InitBoard( BOARD *p_board ) LoadBoard( p_board ); - if( p_board->pos.x < (unsigned) GetSystemMetrics( SM_CXFIXEDFRAME )) + if( p_board->pos.x < GetSystemMetrics( SM_CXFIXEDFRAME ) ) p_board->pos.x = GetSystemMetrics( SM_CXFIXEDFRAME ); - if( p_board->pos.x > (unsigned) (GetSystemMetrics( SM_CXSCREEN ) - - GetSystemMetrics( SM_CXFIXEDFRAME ))) { + if( p_board->pos.x > (GetSystemMetrics( SM_CXSCREEN ) - GetSystemMetrics( SM_CXFIXEDFRAME ))) + { p_board->pos.x = GetSystemMetrics( SM_CXSCREEN ) - GetSystemMetrics( SM_CXFIXEDFRAME ); } - if( p_board->pos.y < (unsigned) (GetSystemMetrics( SM_CYMENU ) - + GetSystemMetrics( SM_CYCAPTION ) - + GetSystemMetrics( SM_CYFIXEDFRAME ))) { + if( p_board->pos.y < (GetSystemMetrics( SM_CYMENU ) + GetSystemMetrics( SM_CYCAPTION ) + GetSystemMetrics( SM_CYFIXEDFRAME ))) + { p_board->pos.y = GetSystemMetrics( SM_CYMENU ) + GetSystemMetrics( SM_CYCAPTION ) + GetSystemMetrics( SM_CYFIXEDFRAME ); } - if( p_board->pos.y > (unsigned) (GetSystemMetrics( SM_CYSCREEN ) - - GetSystemMetrics( SM_CYFIXEDFRAME ))) { + if( p_board->pos.y > (GetSystemMetrics( SM_CYSCREEN ) - GetSystemMetrics( SM_CYFIXEDFRAME ))) + { p_board->pos.y = GetSystemMetrics( SM_CYSCREEN ) - GetSystemMetrics( SM_CYFIXEDFRAME ); } hMenu = GetMenu( p_board->hWnd ); - CheckMenuItem( hMenu, IDM_BEGINNER + (unsigned) p_board->difficulty, - MF_CHECKED ); + CheckMenuItem( hMenu, IDM_BEGINNER + p_board->difficulty, MF_CHECKED ); + if( p_board->IsMarkQ ) CheckMenuItem( hMenu, IDM_MARKQ, MF_CHECKED ); else @@ -297,90 +296,81 @@ void InitBoard( BOARD *p_board ) void LoadBoard( BOARD *p_board ) { - DWORD size; - DWORD type; + DWORD dwSize; + DWORD dwValue; HKEY hkey; char data[16]; char key_name[8]; unsigned i; - RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\Wine\\WineMine", + RegOpenKeyEx( HKEY_CURRENT_USER, WINEMINE_REGKEY, 0, KEY_QUERY_VALUE, &hkey ); - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Xpos", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) { - p_board->pos.x = atoi( data ); - } + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Xpos", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->pos.x = dwValue; else p_board->pos.x = GetSystemMetrics( SM_CXFIXEDFRAME ); - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Ypos", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->pos.y = atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Ypos", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->pos.y = dwValue; else p_board->pos.y = GetSystemMetrics( SM_CYMENU ) + GetSystemMetrics( SM_CYCAPTION ) + GetSystemMetrics( SM_CYFIXEDFRAME ); - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Rows", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->rows = atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Rows", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->rows = dwValue; else p_board->rows = BEGINNER_ROWS; - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Cols", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->cols = atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Cols", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->cols = dwValue; else p_board->cols = BEGINNER_COLS; - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Mines", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->mines = atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Mines", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->mines = dwValue; else p_board->rows = BEGINNER_ROWS; - size = sizeof( data ); - if( RegQueryValueEx( hkey, "Difficulty", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->difficulty = (DIFFICULTY) atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "Difficulty", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->difficulty = (DIFFICULTY) dwValue; else p_board->difficulty = BEGINNER; - size = sizeof( data ); - if( RegQueryValueEx( hkey, "MarkQ", NULL, (LPDWORD) &type, - (LPBYTE) data, (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->IsMarkQ = atoi( data ); + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, "MarkQ", NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->IsMarkQ = dwValue; else p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Name%d", i ); - size = sizeof( data ); - if( RegQueryValueEx( hkey, key_name, NULL, (LPDWORD) &type, - (LPBYTE) data, - (LPDWORD) &size ) == ERROR_SUCCESS ) - strncpy( p_board->best_name[i], data, sizeof( data ) ); + dwSize = sizeof( data ); + + if( RegQueryValueEx( hkey, key_name, NULL, NULL, (LPBYTE) data, (LPDWORD) &dwSize ) == ERROR_SUCCESS ) + strncpy( p_board->best_name[i], data, sizeof( data ) ); else wsprintf( p_board->best_name[i], "Nobody"); } for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Time%d", i ); - size = sizeof( data ); - if( RegQueryValueEx( hkey, key_name, NULL, (LPDWORD) &type, - (LPBYTE) data, - (LPDWORD) &size ) == ERROR_SUCCESS ) - p_board->best_time[i] = atoi( data ); + + dwSize = sizeof(DWORD); + if( RegQueryValueEx( hkey, key_name, NULL, NULL, (LPBYTE) &dwValue, &dwSize ) == ERROR_SUCCESS ) + p_board->best_time[i] = dwValue; else p_board->best_time[i] = 999; } + RegCloseKey( hkey ); } @@ -392,32 +382,19 @@ void SaveBoard( BOARD *p_board ) char data[16]; char key_name[8]; - if( RegCreateKeyEx( HKEY_LOCAL_MACHINE, - "Software\\Wine\\WineMine", 0, NULL, + if( RegCreateKeyEx( HKEY_CURRENT_USER, + WINEMINE_REGKEY, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &disp ) != ERROR_SUCCESS) return; - wsprintf( data, "%d", p_board->pos.x ); - RegSetValueEx( hkey, "Xpos", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", p_board->pos.x ); - RegSetValueEx( hkey, "Ypos", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", (int) p_board->difficulty ); - RegSetValueEx( hkey, "Difficulty", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", p_board->rows ); - RegSetValueEx( hkey, "Rows", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", p_board->cols ); - RegSetValueEx( hkey, "Cols", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", p_board->mines ); - RegSetValueEx( hkey, "Mines", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); - - wsprintf( data, "%d", (int) p_board->IsMarkQ ); - RegSetValueEx( hkey, "MarkQ", 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); + RegSetValueEx( hkey, "Xpos", 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(DWORD) ); + RegSetValueEx( hkey, "Ypos", 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(DWORD) ); + RegSetValueEx( hkey, "Difficulty", 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(DWORD) ); + RegSetValueEx( hkey, "Rows", 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(DWORD) ); + RegSetValueEx( hkey, "Cols", 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(DWORD) ); + RegSetValueEx( hkey, "Mines", 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(DWORD) ); + RegSetValueEx( hkey, "MarkQ", 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(DWORD) ); for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Name%u", i ); @@ -427,9 +404,9 @@ void SaveBoard( BOARD *p_board ) for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Time%u", i ); - wsprintf( data, "%d", p_board->best_time[i] ); - RegSetValueEx( hkey, key_name, 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); + RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) p_board->best_time[i], sizeof(DWORD) ); } + RegCloseKey( hkey ); } @@ -787,6 +764,7 @@ void DrawBoard( HDC hdc, HDC hMemDC, PAINTSTRUCT *ps, BOARD *p_board ) void TestBoard( HWND hWnd, BOARD *p_board, unsigned x, unsigned y, int msg ) { POINT pt; + UINT col, row; pt.x = x; pt.y = y; @@ -802,9 +780,24 @@ void TestBoard( HWND hWnd, BOARD *p_board, unsigned x, unsigned y, int msg ) p_board->press.y = 0; } - if( p_board->boxes_left == 0 ) { + if( p_board->boxes_left == 0 ) + { + // MG - 2006-02-21 + // mimic MS minesweeper behaviour - when autocompleting a board, flag mines p_board->status = WON; - + for( col = 0; col <= p_board->cols + 1; col++ ) + { + for( row = 0; row <= p_board->rows + 1; row++ ) + { + if(p_board->box[col][row].IsMine == TRUE) + { + p_board->box[col][row].FlagType = FLAG; + } + } + } + p_board->num_flags = p_board->mines; + RedrawWindow( p_board->hWnd, NULL, NULL_HANDLE, RDW_INVALIDATE | RDW_UPDATENOW ); + if( p_board->difficulty != CUSTOM && p_board->time < p_board->best_time[p_board->difficulty] ) { p_board->best_time[p_board->difficulty] = p_board->time; diff --git a/reactos/base/applications/games/winemine/main.h b/reactos/base/applications/games/winemine/main.h index 1f8b4cca91a..35dc0e146e6 100644 --- a/reactos/base/applications/games/winemine/main.h +++ b/reactos/base/applications/games/winemine/main.h @@ -18,9 +18,11 @@ #include +#define WINEMINE_REGKEY "Software\\ReactOS\\WineMine" + #define BEGINNER_MINES 10 -#define BEGINNER_COLS 8 -#define BEGINNER_ROWS 8 +#define BEGINNER_COLS 9 +#define BEGINNER_ROWS 9 #define ADVANCED_MINES 40 #define ADVANCED_COLS 16 diff --git a/reactos/base/applications/games/winemine/resource.h b/reactos/base/applications/games/winemine/resource.h index a02d45a4753..7bcbb016ff1 100644 --- a/reactos/base/applications/games/winemine/resource.h +++ b/reactos/base/applications/games/winemine/resource.h @@ -48,9 +48,12 @@ #define IDC_EDITMINES 1033 #define IDS_APPNAME 1101 +#define IDS_SECONDS 1102 #define IDI_WINEMINE 1201 #define IDB_FACES 1301 #define IDB_LEDS 1302 #define IDB_MINES 1303 + +#define IDRESET 1401