80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Cumulative changes

Browse Source 
Move to translateable (System Default) message
Move change language to Tools menu
Redesign the language dialog
Add the translators' name to the About dialog, to make the translation process more attractive
This commit is contained in:
Laci bá
2021-11-13 22:36:13 +01:00
parent 3fa1e88d7d
commit 7ae10144ad
5 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/language.h
View File

@@ -229,7 +229,7 @@
#define IDS_6146 6146 // "1.5%% below perfect RPM"
#define IDS_6147 6147 // "2%% below perfect RPM"
#define IDS_7168 7168 // "English (United States)"
#define IDS_7168 7168 // "(System Default)"
#define IDS_LANG_ENUS IDS_7168

1
src/include/86box/resource.h
View File

@@ -266,7 +266,6 @@
#define IDC_COMBO_LANG 1009 /* change language dialog */
#define IDC_CHECKBOX_GLOBAL 1300
#define IDC_BUTTON_SYSTEM 1301
#define IDC_BUTTON_DEFAULT 1302
/* For the DeviceConfig code, re-do later. */

37
src/win/languages/en-US.rc
View File

@@ -62,7 +62,6 @@ BEGIN
MENUITEM "&Linear", IDM_VID_FILTER_LINEAR
END
MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI
MENUITEM "Dis&play language...", IDM_VID_PROG_SETT
MENUITEM SEPARATOR
MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN
POPUP "Fullscreen &stretch mode"
@@ -99,6 +98,8 @@ BEGIN
BEGIN
MENUITEM "&Settings...", IDM_CONFIG
MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change dis&play language...", IDM_VID_PROG_SETT
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Enable &Discord integration", IDM_DISCORD
@@ -270,20 +271,17 @@ END
// Dialog
//
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 286, 86
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 240, 86
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Change Display Language"
FONT 9, "Segoe UI"
BEGIN
DEFPUSHBUTTON "OK", IDOK, 166, 64, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 222, 64, 50, 14
COMBOBOX IDC_COMBO_LANG, 10, 18, 266, 16, CBS_DROPDOWNLIST | CBS_HASSTRINGS
#if 0
AUTOCHECKBOX "Use these settings as global &defaults", IDC_CHECKBOX_GLOBAL, 8, 67, 152, 8
#endif
PUSHBUTTON "&System Language", IDC_BUTTON_SYSTEM, 120, 35, 82, 14
PUSHBUTTON "&Default", IDC_BUTTON_DEFAULT, 206, 35, 60, 14
LTEXT "Language:", 0, 9, 8, 34, 8
DEFPUSHBUTTON "OK", IDOK, 123, 65, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 179, 65, 50, 14
COMBOBOX IDC_COMBO_LANG, 13, 18, 213, 22, CBS_DROPDOWNLIST | CBS_HASSTRINGS
AUTOCHECKBOX "Save these settings as &global defaults", IDC_CHECKBOX_GLOBAL, 13, 50, 217, 8 , WS_DISABLED
PUSHBUTTON "&Default", IDC_BUTTON_DEFAULT, 162, 32, 60, 14
LTEXT "Language:", 0, 13, 8, 34, 8
END
DLG_STATUS DIALOG DISCARDABLE 0, 0, 186, 386
@@ -834,7 +832,20 @@ BEGIN
IDS_2123 "Save"
IDS_2124 "About 86Box"
IDS_2125 "86Box v" EMU_VERSION
IDS_2126 "An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information."
IDS_2126 "An emulator of old computers\n\n"
"Authors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\n"
/*
Translate the following line as "Translated by: <your name goes here>\n\n".
If there were previous translators, don't erase their name, just add yours to the end of line.
*/
"This is the program's base language.\n\n"
"Released under the GNU General Public License version 2 or later. See LICENSE for more information."
IDS_2127 "OK"
IDS_2128 "Hardware not available"
#ifdef _WIN32
@@ -979,7 +990,7 @@ BEGIN
IDS_6146 "1.5%% below perfect RPM"
IDS_6147 "2%% below perfect RPM"
IDS_7168 "English (United States)"
IDS_7168 "(System Default)"
END
#define IDS_LANG_ENUS IDS_7168

37
src/win/languages/hu-HU.rc
View File

@@ -4,6 +4,8 @@
// Translated by Laci bá', 2021
//
#define TRANSLATORS_NAME "Laci bá'"
#ifdef _WIN32
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
#pragma code_page(65001)
@@ -65,7 +67,6 @@ BEGIN
MENUITEM "&Lineáris", IDM_VID_FILTER_LINEAR
END
MENUITEM "Hi&DPI méretezés", IDM_VID_HIDPI
MENUITEM "&Nyelvi beállítások...", IDM_VID_PROG_SETT
MENUITEM SEPARATOR
MENUITEM "&Teljes képernyő\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN
POPUP "Teljes képernyős &méretezés"
@@ -102,6 +103,8 @@ BEGIN
BEGIN
MENUITEM "&Beállítások...", IDM_CONFIG
MENUITEM "Állapotsori ikonok &frissítése", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "A &program nyelvének módosítása...", IDM_VID_PROG_SETT
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
@@ -272,20 +275,17 @@ END
//
// Dialog
//
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 286, 86
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 240, 86
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Nyelvi beállítások"
FONT 9, "Segoe UI"
BEGIN
DEFPUSHBUTTON "OK", IDOK, 166, 64, 50, 14
PUSHBUTTON "Mégse", IDCANCEL, 222, 64, 50, 14
COMBOBOX IDC_COMBO_LANG, 10, 18, 266, 16, CBS_DROPDOWNLIST | CBS_HASSTRINGS
#if 0
AUTOCHECKBOX "Ezen beállítások használata mint alapérték", IDC_CHECKBOX_GLOBAL, 8, 67, 152, 8
#endif
PUSHBUTTON "A &rendszer nyelve", IDC_BUTTON_SYSTEM, 120, 35, 82, 14
PUSHBUTTON "&Alapértelmezett", IDC_BUTTON_DEFAULT, 206, 35, 60, 14
LTEXT "Nyelv:", 0, 9, 8, 34, 8
DEFPUSHBUTTON "OK", IDOK, 123, 65, 50, 14
PUSHBUTTON "Mégse", IDCANCEL, 179, 65, 50, 14
COMBOBOX IDC_COMBO_LANG, 13, 18, 213, 22, CBS_DROPDOWNLIST | CBS_HASSTRINGS
AUTOCHECKBOX "Beállítások mentése &globális alapértékként", IDC_CHECKBOX_GLOBAL, 13, 50, 217, 8, WS_DISABLED
PUSHBUTTON "&Alapértelmezett", IDC_BUTTON_DEFAULT, 162, 32, 60, 14
LTEXT "Nyelv:", 0, 13, 8, 34, 8
END
DLG_STATUS DIALOG DISCARDABLE 0, 0, 186, 386
@@ -834,7 +834,18 @@ BEGIN
IDS_2123 "Mentés"
IDS_2124 "A 86Box névjegye"
IDS_2125 "86Box v" EMU_VERSION
IDS_2126 "Régi számítógépek emulátora\n\nFejlesztők: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, és mások.\n\nMegjelent a GNU General Public License v2 alatt. További információért lásd a LICENSE fájlt. "
IDS_2126 "Régi számítógépek emulátora\n\n"
"Fejlesztők: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\n"
/*
Translate the following line as "Translated by: <your name goes here>\n\n".
If there were previous translators, don't erase their name, just add yours to the end of line.
*/
"Fordította: Laci bá'\n\n"
"Megjelent a GNU General Public License v2 vagy újabb alatt. További információért lásd a LICENSE fájlt."
IDS_2127 "OK"
IDS_2128 "Hardver nem elérhető"
#ifdef _WIN32
@@ -979,7 +990,7 @@ BEGIN
IDS_6146 "1.5%%-kal a tökéletes RPM alatt"
IDS_6147 "2%%-kal a tökéletes RPM alatt"
IDS_7168 "magyar (Magyarország)"
IDS_7168 "(A rendszer nyelve)"
END
#define IDS_LANG_ENUS IDS_7168

2
src/win/win_lang.c
View File

@@ -66,7 +66,7 @@ progsett_fill_languages(HWND hdlg)
HWND lang_combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
SendMessage(lang_combo, CB_RESETCONTENT, 0, 0);
SendMessage(lang_combo, CB_ADDSTRING, 0, (LPARAM)L"(System Default)");
SendMessage(lang_combo, CB_ADDSTRING, 0, win_get_string(IDS_7168));
SendMessage(lang_combo, CB_SETITEMDATA, 0, 0xFFFF);
enum_helper = 0; c = 1;