From d5c3a1ae9a4eb7e5397e41bb918bab2de03688d3 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 23 May 2023 19:55:14 +0300 Subject: [PATCH] Missing translation strings added --- od-win32/resources/resource.h | 10 ++++++++++ od-win32/resources/winuae.rc | 13 +++++++++++++ od-win32/win32gui.cpp | 24 ++++++++++++------------ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index f3846ec8..b6931be0 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -420,6 +420,16 @@ #define IDS_SYNCMODE_COMBINED 425 #define IDS_SYNCMODE_CSYNC 426 #define IDS_SYNCMODE_HVSYNC 427 +#define IDS_MEMINFO 428 +#define IDS_INPUTINVERT 429 +#define IDS_BOARDTYPE 430 +#define IDS_BOARDNAME 431 +#define IDS_BOARDSTART 432 +#define IDS_BOARDEND 433 +#define IDS_BOARDSIZE 434 +#define IDS_BOARDID 435 +#define IDS_ASSOCIATEEXTENSIONS 436 +#define IDS_ASSOCIATEEXTENSION 436 #define IDS_QS_MODELS 1000 #define IDS_QS_MODEL_A500 1001 #define IDS_QS_MODEL_A500P 1002 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 8af5edef..c1e61d22 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -2201,6 +2201,10 @@ BEGIN IDS_SYNCMODE_COMBINED "Combined" IDS_SYNCMODE_CSYNC "Composite Sync" IDS_SYNCMODE_HVSYNC "H/V Sync" + IDS_MEMINFO "Configured 32-bit address space: %dM, reserved: %dM, Z3 available: %dM (UAE), %dM (Real)" + IDS_INPUTINVERT "Invert" + IDS_BOARDTYPE "Type" + IDS_BOARDNAME "Name" END STRINGTABLE @@ -2220,6 +2224,15 @@ BEGIN IDS_TABLET_MODE "-\nTablet emulation\n" END +STRINGTABLE +BEGIN + IDS_BOARDSTART "Start" + IDS_BOARDEND "End" + IDS_BOARDSIZE "Size" + IDS_BOARDID "ID" + IDS_ASSOCIATEEXTENSION "Extension" +END + #endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 142ab1b7..1e21392b 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -4993,12 +4993,12 @@ static void InitializeListView (HWND hDlg) listview_id = IDC_BOARDLIST; listview_num_columns = BOARD_COLUMNS;; lv_type = LV_BOARD; - _tcscpy(column_heading[0], _T("Type")); - _tcscpy(column_heading[1], _T("Name")); - _tcscpy(column_heading[2], _T("Start")); - _tcscpy(column_heading[3], _T("End")); - _tcscpy(column_heading[4], _T("Size")); - _tcscpy(column_heading[5], _T("ID")); + WIN32GUI_LoadUIString(IDS_BOARDTYPE, column_heading[0], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_BOARDNAME, column_heading[1], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_BOARDSTART, column_heading[2], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_BOARDEND, column_heading[3], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_BOARDSIZE, column_heading[4], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_BOARDID, column_heading[5], MAX_COLUMN_HEADING_WIDTH); } else if (hDlg == pages[HARDDISK_ID]) { @@ -5022,8 +5022,8 @@ static void InitializeListView (HWND hDlg) WIN32GUI_LoadUIString (IDS_INPUTHOSTWIDGET, column_heading[0], MAX_COLUMN_HEADING_WIDTH); WIN32GUI_LoadUIString (IDS_INPUTAMIGAEVENT, column_heading[1], MAX_COLUMN_HEADING_WIDTH); WIN32GUI_LoadUIString (IDS_INPUTAUTOFIRE, column_heading[2], MAX_COLUMN_HEADING_WIDTH); - WIN32GUI_LoadUIString (IDS_INPUTTOGGLE, column_heading[3], MAX_COLUMN_HEADING_WIDTH); - _tcscpy (column_heading[4], _T("Invert")); + WIN32GUI_LoadUIString(IDS_INPUTTOGGLE, column_heading[3], MAX_COLUMN_HEADING_WIDTH); + WIN32GUI_LoadUIString(IDS_INPUTINVERT, column_heading[4], MAX_COLUMN_HEADING_WIDTH); WIN32GUI_LoadUIString (IDS_INPUTQUALIFIER, column_heading[5], MAX_COLUMN_HEADING_WIDTH); _tcscpy (column_heading[6], _T("#")); @@ -5039,7 +5039,7 @@ static void InitializeListView (HWND hDlg) listview_id = IDC_ASSOCIATELIST; listview_num_columns = MISC2_COLUMNS; lv_type = LV_MISC2; - _tcscpy (column_heading[0], _T("Extension")); + WIN32GUI_LoadUIString(IDS_ASSOCIATEEXTENSION, column_heading[0], MAX_COLUMN_HEADING_WIDTH); _tcscpy (column_heading[1], _T("")); } else if (hDlg == pages[MISC1_ID]) { @@ -10025,7 +10025,7 @@ static void setfastram_selectmenu(HWND hDlg, int mode) extern uae_u32 natmem_reserved_size; static void setmax32bitram (HWND hDlg) { - TCHAR tmp[256]; + TCHAR tmp[256], tmp2[256]; uae_u32 size32 = 0, z3size_uae = 0, z3size_real = 0; z3size_uae = natmem_reserved_size >= expamem_z3_pointer_uae ? natmem_reserved_size - expamem_z3_pointer_uae : 0; @@ -10046,8 +10046,8 @@ static void setmax32bitram (HWND hDlg) if (size32 >= first) size32 -= first; - _stprintf (tmp, L"Configured 32-bit address space: %dM, reserved: %dM, Z3 available: %dM (UAE), %dM (Real)", - size32 / (1024 * 1024), (natmem_reserved_size - 256 * 1024 * 1024) / (1024 * 1024), z3size_uae / (1024 * 1024), z3size_real / (1024 * 1024)); + WIN32GUI_LoadUIString(IDS_MEMINFO, tmp2, sizeof(tmp2) / sizeof(TCHAR)); + _stprintf (tmp, tmp2, size32 / (1024 * 1024), (natmem_reserved_size - 256 * 1024 * 1024) / (1024 * 1024), z3size_uae / (1024 * 1024), z3size_real / (1024 * 1024)); SetDlgItemText (hDlg, IDC_MAX32RAM, tmp); } -- 2.47.3