From 474f962274786d025e6e05722e79fa014f7525d7 Mon Sep 17 00:00:00 2001 From: Teemu Korhonen <80648513+ts-korhonen@users.noreply.github.com> Date: Sat, 12 Feb 2022 19:27:27 +0200 Subject: [PATCH 01/23] qt: fix MinGW builds; set NTDDI_VERSION explicitly (#2110) MinGW Qt windows.h defines NTDDI_VERSION as Windows Vista while WINVER and WIN32_WINNT as Windows 7. --- src/qt/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index 9bae270ab..e246ce920 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -146,6 +146,10 @@ if(WIN32) set_property(SOURCE ../win/86Box-qt.rc PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST) target_sources(86Box PRIVATE ../win/86Box.manifest) endif() + + if (MINGW) + add_compile_definitions(NTDDI_VERSION=0x06010000) + endif() else() target_sources(plat PRIVATE sdl_joystick.cpp) endif() From eb91c899c655ee0b7986ed7547efa64a2af21095 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 13 Feb 2022 00:35:46 +0600 Subject: [PATCH 02/23] qt: Group with the manager on taskbar on settings mode --- src/qt/qt_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index a3074bc2d..d9d667c9e 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -43,6 +43,7 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin) #include "qt_winrawinputfilter.hpp" #include "qt_winmanagerfilter.hpp" #include <86box/win.h> +#include #endif extern "C" @@ -165,6 +166,7 @@ int main(int argc, char* argv[]) { auto font_name = QObject::tr("FONT_NAME"); auto font_size = QObject::tr("FONT_SIZE"); QApplication::setFont(QFont(font_name, font_size.toInt())); + SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); #endif if (! pc_init_modules()) { ui_msgbox_header(MBX_FATAL, (void*)IDS_2120, (void*)IDS_2056); From 346597a9a9f67836886e5c2b3a8cb5adb0dc9642 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 13 Feb 2022 00:36:47 +0600 Subject: [PATCH 03/23] qt: Fix toolbar text when paused --- src/qt/qt_mainwindow.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index d7c25ebfa..d1b68b082 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -67,10 +67,6 @@ extern "C" { #include #include -#ifdef Q_OS_WINDOWS -#include -#endif - #include "qt_settings.hpp" #include "qt_machinestatus.hpp" #include "qt_mediamenu.hpp" @@ -93,14 +89,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { -#ifdef Q_OS_WINDOWS - SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); - - auto font_name = tr("FONT_NAME"); - auto font_size = tr("FONT_SIZE"); - QApplication::setFont(QFont(font_name, font_size.toInt())); -#endif - mm = std::make_shared(this); MediaMenu::ptr = mm; status = std::make_unique(this); @@ -138,6 +126,11 @@ MainWindow::MainWindow(QWidget *parent) : connect(this, &MainWindow::showMessageForNonQtThread, this, &MainWindow::showMessage_, Qt::BlockingQueuedConnection); connect(this, &MainWindow::setTitle, this, [this,toolbar_label](const QString& title) { + if (dopause && !hide_tool_bar) + { + toolbar_label->setText(toolbar_label->text() + " - PAUSED -"); + return; + } if (!hide_tool_bar) #ifdef _WIN32 toolbar_label->setText(title); From 280623713b12d9141ccc4b2dfa76c6a4fff2fd3e Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 19:51:09 -0500 Subject: [PATCH 04/23] Add 512k to SB 32 PNP --- src/sound/snd_sb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index 5d49c9a62..6157412ea 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -2377,6 +2377,9 @@ static const device_config_t sb_32_pnp_config[] = { "None", 0 }, + { + "512 KB", 512 + }, { "2 MB", 2048 }, From 199a5a2b7b189d7b27c7fd1e7b2e6a618fb5af61 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 19:51:37 -0500 Subject: [PATCH 05/23] Correct PSSJ Clone Default I/O Address --- src/sound/snd_pssj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_pssj.c b/src/sound/snd_pssj.c index 703c19341..8c93125ea 100644 --- a/src/sound/snd_pssj.c +++ b/src/sound/snd_pssj.c @@ -241,7 +241,7 @@ void pssj_close(void *p) static const device_config_t pssj_isa_config[] = { { - "base", "Address", CONFIG_HEX16, "", 0xC0, "", { 0 }, + "base", "Address", CONFIG_HEX16, "", 0x2C0, "", { 0 }, { { "0xC0", 0xC0 From 63066a9084c939781d47c8b497cb50a664304b4a Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 19:08:02 -0500 Subject: [PATCH 06/23] Preliminary SB AWE64 Value and Standard, also, correct memory sizes Also add 2MB option for AWE64 Value and Standard. People sometimes removed the onboard RAM and replaced it with a 2MB chip. --- src/include/86box/sound.h | 2 + src/sound/snd_gus.c | 2 +- src/sound/snd_sb.c | 161 ++++++++++++++++++++++++++++++++++++-- src/sound/sound.c | 20 ++--- 4 files changed, 169 insertions(+), 16 deletions(-) diff --git a/src/include/86box/sound.h b/src/include/86box/sound.h index 9583123b0..089aaa667 100644 --- a/src/include/86box/sound.h +++ b/src/include/86box/sound.h @@ -120,6 +120,8 @@ extern const device_t sb_16_pnp_device; extern const device_t sb_32_pnp_device; extern const device_t sb_awe32_device; extern const device_t sb_awe32_pnp_device; +extern const device_t sb_awe64_value_device; +extern const device_t sb_awe64_device; extern const device_t sb_awe64_gold_device; /* Innovation SSI-2001 */ diff --git a/src/sound/snd_gus.c b/src/sound/snd_gus.c index 6cdf26ff6..a20d7fd50 100644 --- a/src/sound/snd_gus.c +++ b/src/sound/snd_gus.c @@ -1201,7 +1201,7 @@ void *gus_init(const device_t *info) io_sethandler(gus->base, 0x0010, readgus, NULL, NULL, writegus, NULL, NULL, gus); io_sethandler(0x0100+gus->base, 0x0010, readgus, NULL, NULL, writegus, NULL, NULL, gus); - io_sethandler(0x0506+gus->base, 0x0001, readgus, NULL, NULL, writegus, NULL, NULL, gus); + io_sethandler(0x0506+gus->base, 0x0001, readgus, NULL, NULL, writegus, NULL, NULL, gus); io_sethandler(0x0388, 0x0002, readgus, NULL, NULL, writegus, NULL, NULL, gus); #if defined(DEV_BRANCH) && defined(USE_GUSMAX) diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index 6157412ea..fd0e0a929 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -1730,6 +1730,20 @@ sb_awe32_pnp_available() } +static int +sb_awe64_value_available() +{ + return sb_awe32_available() && rom_present("roms/sound/CT4520 PnP.BIN"); +} + + +static int +sb_awe64_available() +{ + return sb_awe32_available() && rom_present("roms/sound/CT4520 PnP.BIN"); +} + + static int sb_awe64_gold_available() { @@ -1802,7 +1816,7 @@ sb_awe32_pnp_init(const device_t *info) sb->opl_enabled = 1; opl3_init(&sb->opl); - sb_dsp_init(&sb->dsp, (info->local == 2) ? SBAWE64 : SBAWE32, SB_SUBTYPE_DEFAULT, sb); + sb_dsp_init(&sb->dsp, ((info->local == 2) || (info->local == 3) || (info->local == 4)) ? SBAWE64 : SBAWE32, SB_SUBTYPE_DEFAULT, sb); sb_ct1745_mixer_reset(sb); sb->mixer_enabled = 1; @@ -1821,7 +1835,7 @@ sb_awe32_pnp_init(const device_t *info) sb->gameport = gameport_add(&gameport_pnp_device); - if (info->local != 2) + if ((info->local != 2) && (info->local != 3) && (info->local != 4)) device_add(&ide_ter_pnp_device); char *pnp_rom_file = NULL; @@ -1834,7 +1848,11 @@ sb_awe32_pnp_init(const device_t *info) pnp_rom_file = "roms/sound/CT3980 PnP.BIN"; break; - case 2: + case 2: case 3: + pnp_rom_file = "roms/sound/CT4520 PnP.BIN"; + break; + + case 4: pnp_rom_file = "roms/sound/CT4540 PnP.BIN"; break; } @@ -1858,7 +1876,7 @@ sb_awe32_pnp_init(const device_t *info) isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe32_pnp_config_changed, NULL, NULL, NULL, sb); break; - case 2: + case 2: case 3: case 4: isapnp_add_card(pnp_rom, sizeof(sb->pnp_rom), sb_awe64_gold_pnp_config_changed, NULL, NULL, NULL, sb); break; } @@ -2591,6 +2609,105 @@ static const device_config_t sb_awe32_pnp_config[] = } }; +static const device_config_t sb_awe64_value_config[] = +{ + { + "onboard_ram", "Onboard RAM", CONFIG_SELECTION, "", 512, "", { 0 }, + { + { + "512 KB", 512 + }, + { + "1 MB", 1024 + }, + { + "2 MB", 2048 + }, + { + "4 MB", 4096 + }, + { + "8 MB", 8192 + }, + { + "12 MB", 12288 + }, + { + "16 MB", 16384 + }, + { + "20 MB", 20480 + }, + { + "24 MB", 24576 + }, + { + "28 MB", 28672 + }, + { + "" + } + } + }, + { + "receive_input", "Receive input (SB MIDI)", CONFIG_BINARY, "", 1 + }, + { + "receive_input401", "Receive input (MPU-401)", CONFIG_BINARY, "", 0 + }, + { + "", "", -1 + } +}; + +static const device_config_t sb_awe64_config[] = +{ + { + "onboard_ram", "Onboard RAM", CONFIG_SELECTION, "", 1024, "", { 0 }, + { + { + "1 MB", 1024 + }, + { + "2 MB", 2048 + }, + { + "4 MB", 4096 + }, + { + "8 MB", 8192 + }, + { + "12 MB", 12288 + }, + { + "16 MB", 16384 + }, + { + "20 MB", 20480 + }, + { + "24 MB", 24576 + }, + { + "28 MB", 28672 + }, + { + "" + } + } + }, + { + "receive_input", "Receive input (SB MIDI)", CONFIG_BINARY, "", 1 + }, + { + "receive_input401", "Receive input (MPU-401)", CONFIG_BINARY, "", 0 + }, + { + "", "", -1 + } +}; + static const device_config_t sb_awe64_gold_config[] = { { @@ -2609,7 +2726,13 @@ static const device_config_t sb_awe64_gold_config[] = "16 MB", 16384 }, { - "28 MB", 28*1024 + "20 MB", 20480 + }, + { + "24 MB", 24576 + }, + { + "28 MB", 28672 }, { "" @@ -2787,12 +2910,38 @@ const device_t sb_awe32_pnp_device = sb_awe32_pnp_config }; +const device_t sb_awe64_value_device = +{ + "Sound Blaster AWE64 Value", + "sbawe64_value", + DEVICE_ISA | DEVICE_AT, + 2, + sb_awe32_pnp_init, sb_awe32_close, NULL, + { sb_awe64_value_available }, + sb_speed_changed, + NULL, + sb_awe64_value_config +}; + +const device_t sb_awe64_device = +{ + "Sound Blaster AWE64", + "sbawe64", + DEVICE_ISA | DEVICE_AT, + 3, + sb_awe32_pnp_init, sb_awe32_close, NULL, + { sb_awe64_available }, + sb_speed_changed, + NULL, + sb_awe64_config +}; + const device_t sb_awe64_gold_device = { "Sound Blaster AWE64 Gold", "sbawe64_gold", DEVICE_ISA | DEVICE_AT, - 2, + 4, sb_awe32_pnp_init, sb_awe32_close, NULL, { sb_awe64_gold_available }, sb_speed_changed, diff --git a/src/sound/sound.c b/src/sound/sound.c index 9ff3036ff..f203a6f76 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -101,28 +101,30 @@ static const device_t sound_internal_device = { static const SOUND_CARD sound_cards[] = { { &sound_none_device }, - { &sound_internal_device }, - { &adlib_device }, + { &sound_internal_device }, + { &adlib_device }, { &adgold_device }, { &azt2316a_device }, { &azt1605_device }, { &cs4236b_device }, - { &sb_1_device }, - { &sb_15_device }, - { &sb_2_device }, + { &sb_1_device }, + { &sb_15_device }, + { &sb_2_device }, { &sb_pro_v1_device }, { &sb_pro_v2_device }, - { &sb_16_device }, + { &sb_16_device }, { &sb_16_pnp_device }, { &sb_32_pnp_device }, { &sb_awe32_device }, { &sb_awe32_pnp_device }, + { &sb_awe64_value_device }, + { &sb_awe64_device }, { &sb_awe64_gold_device }, #if defined(DEV_BRANCH) && defined(USE_PAS16) - { &pas16_device }, + { &pas16_device }, #endif { &pssj_isa_device }, - { &wss_device }, + { &wss_device }, { &adlib_mca_device }, { &ncr_business_audio_device }, { &sb_mcv_device }, @@ -130,7 +132,7 @@ static const SOUND_CARD sound_cards[] = { &es1371_device }, { &ad1881_device }, { &cs4297a_device }, - { NULL } + { NULL } }; From f8f59348025dc8bbeeb7213ac81e40ff052a16fd Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 20:23:21 -0500 Subject: [PATCH 07/23] Fix Github actions build on Linux --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 35800ea83..0c85655c1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -252,7 +252,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt update && sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libopenal-dev libc6-dev librtmidi-dev qtbase5-dev + run: sudo apt update && sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libopenal-dev libc6-dev librtmidi-dev qtbase5-dev qttools5-dev - name: Configure CMake run: >- cmake -S . -B build From 0b9c9f32b16f6e869ea9ce9f4b527bef617b477b Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 21:11:39 -0500 Subject: [PATCH 08/23] Fix visibility --- src/win/languages/de-DE.rc | 2 +- src/win/languages/dialogs.rc | 48 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 63186994f..c841a78cd 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -341,7 +341,7 @@ END #define STR_TURBO "Turbo-Timings" #define STR_CHECKBPB "BPB überprüfen" #define STR_CDROM_DRIVES "CD-ROM-Laufwerke:" -#define STR_CD_SPEED "Geschwindigkeit:" +#define STR_CD_SPEED "Takt:" #define STR_MO_DRIVES "MO-Laufwerke:" #define STR_ZIP_DRIVES "ZIP-Laufwerke:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 4f838014c..4a4c132fc 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -584,7 +584,7 @@ BEGIN END -DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 219, 151 +DLG_CFG_HARD_DISKS_ADD DIALOG DISCARDABLE 0, 0, 239, 151 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Hard Disk" FONT FONT_SIZE, FONT_NAME @@ -592,61 +592,61 @@ BEGIN LTEXT STR_FILE_NAME, IDT_FILE_NAME, 7, 7, 204, 12 EDITTEXT IDC_EDIT_HD_FILE_NAME, - 7, 18, 153, 12 + 7, 18, 173, 12 PUSHBUTTON STR_SPECIFY, IDC_CFILE, - 167, 18, 44, CFG_BTN_HEIGHT + 187, 18, 44, CFG_BTN_HEIGHT LTEXT STR_CYLS, IDT_CYLS, - 7, 37, 32, 12 + 7, 37, 42, 12 EDITTEXT IDC_EDIT_HD_CYL, - 42, 36, 28, 12 + 50, 36, 28, 12 LTEXT STR_HEADS, IDT_HEADS, - 81, 37, 29, 12 + 86, 37, 29, 12 EDITTEXT IDC_EDIT_HD_HPC, - 112, 36, 28, 12 + 122, 36, 28, 12 LTEXT STR_SECTORS, IDT_SECTORS, - 154, 37, 27, 12 + 164, 37, 33, 12 EDITTEXT IDC_EDIT_HD_SPT, - 183, 36, 28, 12 + 197, 36, 28, 12 LTEXT STR_SIZE_MB, IDT_SIZE_MB, - 7, 56, 33, 12 + 7, 56, 48, 12 EDITTEXT IDC_EDIT_HD_SIZE, - 42, 54, 28, 12 + 50, 54, 28, 12 LTEXT STR_TYPE, IDT_TYPE, 86, 56, 24, 12 COMBOBOX IDC_COMBO_HD_TYPE, - 113, 54, 98, 12, + 133, 54, 98, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_BUS,IDT_BUS, 7, 75, 24, 12 COMBOBOX IDC_COMBO_HD_BUS, - 33, 73, 58, 12, + 43, 73, 58, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CHANNEL, IDT_CHANNEL, - 99, 75, 34, 12 + 109, 75, 34, 12 COMBOBOX IDC_COMBO_HD_CHANNEL, - 134, 73, 77, 12, + 144, 73, 87, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_HD_CHANNEL_IDE, - 134, 73, 77, 12, + 144, 73, 87, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_ID, IDT_ID, - 99, 75, 34, 12 + 109, 75, 34, 12 COMBOBOX IDC_COMBO_HD_ID, - 134, 73, 77, 12, + 144, 73, 87, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_IMG_FORMAT, IDT_IMG_FORMAT, - 7, 94, 50, 12 + 7, 94, 70, 12 COMBOBOX IDC_COMBO_HD_IMG_FORMAT, - 58, 92, 153, 12, + 78, 92, 153, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_BLOCK_SIZE, IDT_BLOCK_SIZE, @@ -663,9 +663,9 @@ BEGIN 7, 16, 204, 12 DEFPUSHBUTTON STR_OK, IDOK, - 55, 129, 50, CFG_BTN_HEIGHT + 75, 129, 50, CFG_BTN_HEIGHT PUSHBUTTON STR_CANCEL, IDCANCEL, - 112, 129, 50, CFG_BTN_HEIGHT + 132, 129, 50, CFG_BTN_HEIGHT END DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT @@ -721,9 +721,9 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CD_SPEED, IDT_CD_SPEED, - CFG_HMARGIN, 207, 24, CFG_PANE_LTEXT_HEIGHT + CFG_HMARGIN, 207, 34, CFG_PANE_LTEXT_HEIGHT COMBOBOX IDC_COMBO_CD_SPEED, - 33, 205, 328, 12, + 43, 205, 328, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END From 855af3727dcf1326f34472e870dd9ce87e7acdf6 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 23:20:59 -0500 Subject: [PATCH 09/23] Add TNDY --- src/include/86box/sound.h | 1 + src/sound/snd_sn76489.c | 49 +++++++++++++++++++++++++++++++++++++++ src/sound/sound.c | 1 + 3 files changed, 51 insertions(+) diff --git a/src/include/86box/sound.h b/src/include/86box/sound.h index 089aaa667..cbf380901 100644 --- a/src/include/86box/sound.h +++ b/src/include/86box/sound.h @@ -103,6 +103,7 @@ extern const device_t pas16_device; extern const device_t ps1snd_device; /* Tandy PSSJ */ +extern const device_t tndy_device; extern const device_t pssj_device; extern const device_t pssj_isa_device; diff --git a/src/sound/snd_sn76489.c b/src/sound/snd_sn76489.c index 6f60a077e..8f0175af8 100644 --- a/src/sound/snd_sn76489.c +++ b/src/sound/snd_sn76489.c @@ -224,6 +224,18 @@ void *ncr8496_device_init(const device_t *info) return sn76489; } +void *tndy_device_init(const device_t *info) +{ + sn76489_t *sn76489 = malloc(sizeof(sn76489_t)); + memset(sn76489, 0, sizeof(sn76489_t)); + + uint16_t addr = device_get_config_hex16("base"); + + sn76489_init(sn76489, addr, 0x0008, SN76496, 3579545); + + return sn76489; +} + void sn76489_device_close(void *p) { sn76489_t *sn76489 = (sn76489_t *)p; @@ -231,6 +243,30 @@ void sn76489_device_close(void *p) free(sn76489); } +static const device_config_t tndy_config[] = +{ + { + "base", "Address", CONFIG_HEX16, "", 0x0C0, "", { 0 }, + { + { + "0x0C0", 0x0C0 + }, + { + "0x1E0", 0x1E0 + }, + { + "0x2C0", 0x2C0 + }, + { + "" + } + } + }, + { + "", "", -1 + } +}; + const device_t sn76489_device = { "TI SN74689 PSG", @@ -242,6 +278,7 @@ const device_t sn76489_device = NULL, { NULL }, NULL, NULL }; + const device_t ncr8496_device = { "NCR8496 PSG", @@ -253,3 +290,15 @@ const device_t ncr8496_device = NULL, { NULL }, NULL, NULL }; + +const device_t tndy_device = +{ + "TNDY", + "tndy" + DEVICE_ISA, + 0, + tndy_device_init, + sn76489_device_close, + NULL, { NULL }, NULL, + tndy_config +}; diff --git a/src/sound/sound.c b/src/sound/sound.c index f203a6f76..b2b9c4fca 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -123,6 +123,7 @@ static const SOUND_CARD sound_cards[] = #if defined(DEV_BRANCH) && defined(USE_PAS16) { &pas16_device }, #endif + { &tndy_device }, { &pssj_isa_device }, { &wss_device }, { &adlib_mca_device }, From 433d48c8077306b9911f1fcc1cb27a2eb8689eab Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 12 Feb 2022 23:37:00 -0500 Subject: [PATCH 10/23] The IBM 5161 expansion cards were infact ISA --- src/device/ibm_5161.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/device/ibm_5161.c b/src/device/ibm_5161.c index 31a2e7bf9..d18b93cc2 100644 --- a/src/device/ibm_5161.c +++ b/src/device/ibm_5161.c @@ -116,7 +116,7 @@ const device_t ibm_5161_device = { "IBM Expansion Unit (5161)", "ibm_5161", - 0, + DEVICE_ISA, 0, ibm_5161_init, ibm_5161_close, From 15ac4c4b86500ee449c820fc43daa9dfa31395ac Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 13 Feb 2022 01:03:08 -0500 Subject: [PATCH 11/23] Fix silly mistake thanks @lemondrops --- src/sound/snd_sn76489.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_sn76489.c b/src/sound/snd_sn76489.c index 8f0175af8..c2aa2a52d 100644 --- a/src/sound/snd_sn76489.c +++ b/src/sound/snd_sn76489.c @@ -294,7 +294,7 @@ const device_t ncr8496_device = const device_t tndy_device = { "TNDY", - "tndy" + "tndy", DEVICE_ISA, 0, tndy_device_init, From 84a28bd7e8f97b93e006d25c79230bdfa2e2e812 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 13 Feb 2022 19:28:28 +0600 Subject: [PATCH 12/23] qt: Don't pause twice --- src/qt/qt_platform.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 27dab7f85..5a621a364 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -303,13 +303,20 @@ plat_pause(int p) static wchar_t oldtitle[512]; wchar_t title[512]; + if (p == dopause) { +#ifdef Q_OS_WINDOWS + if (source_hwnd) + PostMessage((HWND)(uintptr_t)source_hwnd, WM_SENDSTATUS, (WPARAM)!!p, (LPARAM)(HWND)main_window->winId()); +#endif + return; + } if ((p == 0) && (time_sync & TIME_SYNC_ENABLED)) nvr_time_sync(); dopause = p; if (p) { wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1); - wcscpy(title, oldtitle); + wcscpy(title, oldtitle);twicr wcscat(title, L" - PAUSED -"); ui_window_title(title); } else { From 735a5fe44ecb9eec316432043312ad67316f1dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miran=20Gr=C4=8Da?= Date: Sun, 13 Feb 2022 14:42:36 +0100 Subject: [PATCH 13/23] Update qt_platform.cpp --- src/qt/qt_platform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 5a621a364..e55ac8e4b 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -316,7 +316,7 @@ plat_pause(int p) dopause = p; if (p) { wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1); - wcscpy(title, oldtitle);twicr + wcscpy(title, oldtitle); wcscat(title, L" - PAUSED -"); ui_window_title(title); } else { From 6596c26eece8c316fb3e751da73b7f3c6dd7401d Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:20:35 +0500 Subject: [PATCH 14/23] Update the default copyright year --- CMakeLists.txt | 2 +- src/include_make/86box/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9170741cb..ac9292376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,7 @@ if(NOT EMU_BUILD_NUM) set(EMU_BUILD_NUM 0) endif() if(NOT EMU_COPYRIGHT_YEAR) - set(EMU_COPYRIGHT_YEAR 2021) + set(EMU_COPYRIGHT_YEAR 2022) endif() add_subdirectory(src) diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h index 9228c68e3..efafaa6a3 100644 --- a/src/include_make/86box/version.h +++ b/src/include_make/86box/version.h @@ -32,7 +32,7 @@ #define EMU_VERSION_FULL EMU_VERSION #define EMU_VERSION_FULL_W EMU_VERSION_W -#define COPYRIGHT_YEAR "2021" +#define COPYRIGHT_YEAR "2022" /* Web URL info. */ #define EMU_SITE L"86box.net" From 8cf53950aa7eb3df6f001b3a3b51c37fbceb25c1 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:21:58 +0500 Subject: [PATCH 15/23] Fix character encoding errors in comments --- src/printer/prt_cpmap.c | 4 ++-- src/printer/prt_escp.c | 4 ++-- src/qt/qt_sdl.c | 4 ++-- src/win/win_sdl.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/printer/prt_cpmap.c b/src/printer/prt_cpmap.c index 62c00d544..f5da0e91d 100644 --- a/src/printer/prt_cpmap.c +++ b/src/printer/prt_cpmap.c @@ -10,12 +10,12 @@ * * * - * Authors: Michael Dr�ing, + * Authors: Michael Drüing, * Fred N. van Kempen, * * Based on code by Frederic Weymann (originally for DosBox.) * - * Copyright 2018 Michael Dr�ing. + * Copyright 2018 Michael Drüing. * Copyright 2018 Fred N. van Kempen. * * Redistribution and use in source and binary forms, with diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 8e490e9e1..22bd86e06 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -10,12 +10,12 @@ * * * - * Authors: Michael Dr�ing, + * Authors: Michael Drüing, * Fred N. van Kempen, * * Based on code by Frederic Weymann (originally for DosBox.) * - * Copyright 2018,2019 Michael Dr�ing. + * Copyright 2018,2019 Michael Drüing. * Copyright 2019,2019 Fred N. van Kempen. * * Redistribution and use in source and binary forms, with diff --git a/src/qt/qt_sdl.c b/src/qt/qt_sdl.c index 81a1311d1..08f240862 100644 --- a/src/qt/qt_sdl.c +++ b/src/qt/qt_sdl.c @@ -15,10 +15,10 @@ * * * Authors: Fred N. van Kempen, - * Michael Dr�ing, + * Michael Drüing, * * Copyright 2018-2020 Fred N. van Kempen. - * Copyright 2018-2020 Michael Dr�ing. + * Copyright 2018-2020 Michael Drüing. * * Redistribution and use in source and binary forms, with * or without modification, are permitted provided that the diff --git a/src/win/win_sdl.c b/src/win/win_sdl.c index cf5afb809..cd4b26169 100644 --- a/src/win/win_sdl.c +++ b/src/win/win_sdl.c @@ -15,10 +15,10 @@ * * * Authors: Fred N. van Kempen, - * Michael Dr�ing, + * Michael Drüing, * * Copyright 2018-2020 Fred N. van Kempen. - * Copyright 2018-2020 Michael Dr�ing. + * Copyright 2018-2020 Michael Drüing. * * Redistribution and use in source and binary forms, with * or without modification, are permitted provided that the From e8456cc5ca0fd8db8c61391d7633426771b4a815 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:29:46 +0500 Subject: [PATCH 16/23] Change the internal name for the PIIX3 variation for boards with I/O APIC --- src/chipset/intel_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c index dade95cba..97280b06c 100644 --- a/src/chipset/intel_piix.c +++ b/src/chipset/intel_piix.c @@ -1648,7 +1648,7 @@ const device_t piix3_device = const device_t piix3_ioapic_device = { "Intel 82371SB (PIIX3) (Boards with I/O APIC)", - "piix3", + "piix3_ioapic", DEVICE_PCI, 0x70001403, piix_init, From fd58bb53ffd15eecf9cf2a8794af71c15803adb6 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 27 Jan 2022 20:39:16 +0500 Subject: [PATCH 17/23] isamem: fix a compile warning and add proper dev-branch #ifdefs --- src/device/isamem.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/device/isamem.c b/src/device/isamem.c index 7ef72215f..a987cba77 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -68,11 +68,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include #include #include +#define HAVE_STDARG_H #include <86box/86box.h> #include <86box/machine.h> #include <86box/io.h> @@ -994,7 +996,7 @@ static const device_t ev159_device = { }; -#ifdef USE_ISAMEM_BRAT +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) static const device_config_t brat_config[] = { { @@ -1066,7 +1068,7 @@ static const device_config_t brat_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 512 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1085,7 +1087,7 @@ static const device_t brat_device = { #endif -#ifdef USE_ISAMEM_RAMPAGE +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) static const device_config_t rampage_config[] = { { @@ -1169,7 +1171,7 @@ static const device_config_t rampage_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 128 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1188,7 +1190,7 @@ static const device_t rampage_device = { #endif -#ifdef USE_ISAMEM_IAB +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) static const device_config_t iab_config[] = { { @@ -1272,7 +1274,7 @@ static const device_config_t iab_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 128 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1313,13 +1315,13 @@ static const struct { { &a6pak_device }, { &ems5150_device }, { &ev159_device }, -#ifdef USE_ISAMEM_BRAT +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) { &brat_device }, #endif -#ifdef USE_ISAMEM_RAMPAGE +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) { &rampage_device }, #endif -#ifdef USE_ISAMEM_IAB +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) { &iab_device }, #endif { NULL } From a0a0bfbc7962e2c7174326471a1e4e4da369ba43 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 07:02:35 +0500 Subject: [PATCH 18/23] Port translation changes from #2070 to the Qt UI --- src/qt/languages/pl-PL.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 1b9e05e81..5d51a6dc7 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1007,7 +1007,7 @@ msgid "Disk image too large" msgstr "Obraz dysku jest za duży" msgid "Remember to partition and format the newly-created drive." -msgstr "Nie zapomnij o partycjonowaniu u sformatowaniu nowo utworzego dysku" +msgstr "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzego dysku" msgid "The selected file will be overwritten. Are you sure you want to use it?" msgstr "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?" @@ -1052,7 +1052,7 @@ msgid "Select the parent VHD" msgstr "Wybierz nadrzędny plik VHD" msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?" -msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?" +msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?" msgid "Parent and child disk timestamps do not match" msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się" From e0593523f28dd08cc2d684125a9004ae8329d3a1 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 07:03:37 +0500 Subject: [PATCH 19/23] Make the "PAUSED" toolbar string translatable --- src/include/86box/language.h | 2 +- src/qt/languages/cs-CZ.po | 4 ++-- src/qt/languages/de-DE.po | 4 ++-- src/qt/languages/en-GB.po | 4 ++-- src/qt/languages/en-US.po | 4 ++-- src/qt/languages/es-ES.po | 4 ++-- src/qt/languages/fi-FI.po | 4 ++-- src/qt/languages/fr-FR.po | 4 ++-- src/qt/languages/hr-HR.po | 4 ++-- src/qt/languages/hu-HU.po | 4 ++-- src/qt/languages/it-IT.po | 4 ++-- src/qt/languages/ja-JP.po | 4 ++-- src/qt/languages/ko-KR.po | 4 ++-- src/qt/languages/pl-PL.po | 4 ++-- src/qt/languages/pt-BR.po | 4 ++-- src/qt/languages/pt-PT.po | 4 ++-- src/qt/languages/ru-RU.po | 4 ++-- src/qt/languages/sl-SI.po | 4 ++-- src/qt/languages/tr-TR.po | 4 ++-- src/qt/languages/uk-UA.po | 4 ++-- src/qt/languages/zh-CN.po | 4 ++-- src/qt/qt_mainwindow.cpp | 2 +- src/qt/qt_platform.cpp | 5 +++-- src/unix/unix.c | 2 +- src/win/languages/cs-CZ.rc | 2 +- src/win/languages/de-DE.rc | 2 +- src/win/languages/en-GB.rc | 2 +- src/win/languages/en-US.rc | 2 +- src/win/languages/es-ES.rc | 2 +- src/win/languages/fi-FI.rc | 2 +- src/win/languages/fr-FR.rc | 2 +- src/win/languages/hr-HR.rc | 2 +- src/win/languages/hu-HU.rc | 2 +- src/win/languages/it-IT.rc | 2 +- src/win/languages/ja-JP.rc | 2 +- src/win/languages/ko-KR.rc | 2 +- src/win/languages/pl-PL.rc | 2 +- src/win/languages/pt-BR.rc | 2 +- src/win/languages/pt-PT.rc | 2 +- src/win/languages/ru-RU.rc | 2 +- src/win/languages/sl-SI.rc | 2 +- src/win/languages/tr-TR.rc | 2 +- src/win/languages/uk-UA.rc | 2 +- src/win/languages/zh-CN.rc | 2 +- src/win/win_ui.c | 2 +- 45 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/include/86box/language.h b/src/include/86box/language.h index f9da499be..ec11cfbae 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -24,7 +24,7 @@ #define IDS_STRINGS 2048 // "86Box" #define IDS_2049 2049 // "Error" #define IDS_2050 2050 // "Fatal error" -#define IDS_2051 2051 // "" +#define IDS_2051 2051 // " - PAUSED" #define IDS_2052 2052 // "Press CTRL+ALT+PAGE DOWN..." #define IDS_2053 2053 // "Speed" #define IDS_2054 2054 // "ZIP %i (%03i): %ls" diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 7f8d51957..466d4952a 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -598,8 +598,8 @@ msgstr "Chyba" msgid "Fatal error" msgstr "Kritická chyba" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Stiskněte Ctrl+Alt+Page Down pro návrat z režimu celé obrazovky." diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 7856d962d..55b76baff 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -598,8 +598,8 @@ msgstr "Fehler" msgid "Fatal error" msgstr "Fataler Fehler" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Bitte Strg+Alt+Bild ab zur Rückkehr in den Fenstermodus drücken." diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po index 7f8ace40d..c1ab8aad1 100644 --- a/src/qt/languages/en-GB.po +++ b/src/qt/languages/en-GB.po @@ -598,8 +598,8 @@ msgstr "Error" msgid "Fatal error" msgstr "Fatal error" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Press CTRL+ALT+PAGE DOWN to return to windowed mode." diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po index bce66a3f8..af8fb3a59 100644 --- a/src/qt/languages/en-US.po +++ b/src/qt/languages/en-US.po @@ -598,8 +598,8 @@ msgstr "Error" msgid "Fatal error" msgstr "Fatal error" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Press CTRL+ALT+PAGE DOWN to return to windowed mode." diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index 9e04d0544..ab519f139 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -598,8 +598,8 @@ msgstr "Error" msgid "Fatal error" msgstr "Error fatal" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Pulsa CTRL+ALT+AVPÁG para volver a modo ventana." diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 85af22173..90bc5946b 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -598,8 +598,8 @@ msgstr "Virhe" msgid "Fatal error" msgstr "Vakava virhe" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Paina CTRL+ALT+PAGE DOWN palataksesi ikkunoituun tilaan." diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 54a85e79a..71441e9c0 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -598,8 +598,8 @@ msgstr "Erreur" msgid "Fatal error" msgstr "Erreur fatale" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Appuyez sur CTRL+ALT+PAGE ↓ pour revenir au mode fenêtré." diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index c65fa2c34..3bcc1410b 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -598,8 +598,8 @@ msgstr "Greška" msgid "Fatal error" msgstr "Fatalna greška" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Pritisnite CTRL+ALT+PAGE DOWN za povratak u prozorski način rada." diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index 3f44d06b6..bf7ffcad1 100644 --- a/src/qt/languages/hu-HU.po +++ b/src/qt/languages/hu-HU.po @@ -598,8 +598,8 @@ msgstr "Hiba" msgid "Fatal error" msgstr "Végzetes hiba" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Használja a CTRL+ALT+PAGE DOWN gombokat az ablakhoz való visszatéréshez." diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index bc8275e6b..e4ea724ac 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -598,8 +598,8 @@ msgstr "Errore" msgid "Fatal error" msgstr "Errore fatale" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Usa CTRL+ALT+PAGE DOWN per tornare alla modalità finestra." diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index 38add0fc3..e9376167c 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -598,8 +598,8 @@ msgstr "エラー" msgid "Fatal error" msgstr "致命的なエラー" -msgid "" -msgstr "<予約済み>" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "CTRL+ALT+PAGE DOWNでウィンドウモードに戻ります。" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index b06d800a4..e84d6927f 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -598,8 +598,8 @@ msgstr "오류" msgid "Fatal error" msgstr "치명적인 오류" -msgid "" -msgstr "<예약됨>" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "CTRL+ALT+PAGE DOWN 키를 누르면 창 모드로 전환합니다." diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 1b9e05e81..9c0bef67c 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -598,8 +598,8 @@ msgstr "Błąd" msgid "Fatal error" msgstr "Fatalny błąd" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Naciśnij klawisze CTRL+ALT+PAGE DOWN aby wrócić to trybu okna." diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 5e9418eeb..80813d678 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -598,8 +598,8 @@ msgstr "Erro" msgid "Fatal error" msgstr "Erro fatal" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Use CTRL+ALT+PAGE DOWN para retornar ao modo janela" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index 9f6b1482a..36583c02e 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -598,8 +598,8 @@ msgstr "Erro" msgid "Fatal error" msgstr "Erro fatal" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Pressione CTRL+ALT+PAGE DOWN para voltar ao modo de janela." diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index ac4802b4b..ccc28fd21 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -598,8 +598,8 @@ msgstr "Ошибка" msgid "Fatal error" msgstr "Неустранимая ошибка" -msgid "" -msgstr "<зарезервировано>" +msgid " - PAUSED" +msgstr " - ПАУЗА" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Нажмите CTRL + ALT + PAGE DOWN для возврата в оконный режим." diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index d4bdedfe3..690924f64 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -598,8 +598,8 @@ msgstr "Napaka" msgid "Fatal error" msgstr "Kritična napaka" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Pritisnite CTRL+ALT+PAGE DOWN za povratek iz celozaslonskega načina." diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index a37e71344..895fc0812 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -598,8 +598,8 @@ msgstr "Hata" msgid "Fatal error" msgstr "Kritik hata" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Pencere moduna geri dönmek için CTRL+ALT+PAGE DOWN tuşlarına basın." diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index d5210ad7f..c945a08f4 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -598,8 +598,8 @@ msgstr "Помилка" msgid "Fatal error" msgstr "Непереробна помилка" -msgid "" -msgstr "<зарезервовано>" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "Натисніть CTRL + ALT + PAGE DOWN для повернення у віконний режим." diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 1b00c3586..72e8b394c 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -598,8 +598,8 @@ msgstr "错误" msgid "Fatal error" msgstr "致命错误" -msgid "" -msgstr "" +msgid " - PAUSED" +msgstr " - PAUSED" msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." msgstr "按 CTRL+ALT+PAGE DOWN 组合键返回到窗口模式。" diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index d1b68b082..311cd4b58 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(this, &MainWindow::setTitle, this, [this,toolbar_label](const QString& title) { if (dopause && !hide_tool_bar) { - toolbar_label->setText(toolbar_label->text() + " - PAUSED -"); + toolbar_label->setText(toolbar_label->text() + tr(" - PAUSED")); return; } if (!hide_tool_bar) diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index e55ac8e4b..7c329c074 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -301,7 +301,7 @@ void plat_pause(int p) { static wchar_t oldtitle[512]; - wchar_t title[512]; + wchar_t title[512], paused_msg[64]; if (p == dopause) { #ifdef Q_OS_WINDOWS @@ -317,7 +317,8 @@ plat_pause(int p) if (p) { wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1); wcscpy(title, oldtitle); - wcscat(title, L" - PAUSED -"); + QObject::tr(" - PAUSED").toWCharArray(paused_msg); + wcscat(title, paused_msg); ui_window_title(title); } else { ui_window_title(oldtitle); diff --git a/src/unix/unix.c b/src/unix/unix.c index 62b28b12d..a93609e2e 100644 --- a/src/unix/unix.c +++ b/src/unix/unix.c @@ -716,7 +716,7 @@ plat_pause(int p) if (p) { wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1); wcscpy(title, oldtitle); - wcscat(title, L" - PAUSED -"); + wcscat(title, L" - PAUSED"); ui_window_title(title); } else { ui_window_title(oldtitle); diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 2699627ae..a6bb0b691 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Chyba" IDS_2050 "Kritická chyba" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Stiskněte Ctrl+Alt+Page Down pro návrat z režimu celé obrazovky." IDS_2053 "Rychlost" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index c841a78cd..d68a31ef6 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Fehler" IDS_2050 "Fataler Fehler" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Bitte Strg+Alt+Bild ab zur Rückkehr in den Fenstermodus drücken." IDS_2053 "Geschwindigkeit" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index eec6c4699..814e0c1fc 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Error" IDS_2050 "Fatal error" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." IDS_2053 "Speed" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index e276015e1..bd8e1c92c 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Error" IDS_2050 "Fatal error" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." IDS_2053 "Speed" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 67d2dcbfc..a1da99f59 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Error" IDS_2050 "Error fatal" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Pulsa CTRL+ALT+AVPÁG para volver a modo ventana." IDS_2053 "Velocidad" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 0008bd4c6..e8c5fab0a 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Virhe" IDS_2050 "Vakava virhe" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Paina CTRL+ALT+PAGE DOWN palataksesi ikkunoituun tilaan." IDS_2053 "Nopeus" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index c7c7dcbe6..60d07c596 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Erreur" IDS_2050 "Erreur fatale" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Appuyez sur CTRL+ALT+PAGE ↓ pour revenir au mode fenêtré." IDS_2053 "Vitesse" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 818dbf770..c85ff894a 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Greška" IDS_2050 "Fatalna greška" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Pritisnite CTRL+ALT+PAGE DOWN za povratak u prozorski način rada." IDS_2053 "Brzina" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index ba4d14073..dd3b84654 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -376,7 +376,7 @@ BEGIN 2048 "86Box" IDS_2049 "Hiba" IDS_2050 "Végzetes hiba" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Használja a CTRL+ALT+PAGE DOWN gombokat az ablakhoz való visszatéréshez." IDS_2053 "Sebesség" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 634b73e32..54d098a48 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -372,7 +372,7 @@ BEGIN 2048 "86Box" IDS_2049 "Errore" IDS_2050 "Errore fatale" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Usa CTRL+ALT+PAGE DOWN per tornare alla modalità finestra." IDS_2053 "Velocità" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index fbadc32b4..3107a231a 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "エラー" IDS_2050 "致命的なエラー" - IDS_2051 "<予約済み>" + IDS_2051 " - PAUSED" IDS_2052 "CTRL+ALT+PAGE DOWNでウィンドウモードに戻ります。" IDS_2053 "速度" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index d5f8115f6..e180829d8 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "오류" IDS_2050 "치명적인 오류" - IDS_2051 "<예약됨>" + IDS_2051 " - PAUSED" IDS_2052 "CTRL+ALT+PAGE DOWN 키를 누르면 창 모드로 전환합니다." IDS_2053 "속도" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 6e58d850a..bc9b82623 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Błąd" IDS_2050 "Fatalny błąd" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Naciśnij klawisze CTRL+ALT+PAGE DOWN aby wrócić to trybu okna." IDS_2053 "Szybkość" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 76903e4d6..df42b3a30 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -374,7 +374,7 @@ BEGIN 2048 "86Box" IDS_2049 "Erro" IDS_2050 "Erro fatal" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Use CTRL+ALT+PAGE DOWN para retornar ao modo janela" IDS_2053 "Velocidade" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 1db17eb18..3178c954a 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Erro" IDS_2050 "Erro fatal" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Pressione CTRL+ALT+PAGE DOWN para voltar ao modo de janela." IDS_2053 "Velocidade" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 84f3c6e7d..c9f2db3a7 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Ошибка" IDS_2050 "Неустранимая ошибка" - IDS_2051 "<зарезервировано>" + IDS_2051 " - ПАУЗА" IDS_2052 "Нажмите CTRL + ALT + PAGE DOWN для возврата в оконный режим." IDS_2053 "Скорость" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index e67ba0ab8..0571f36b0 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Napaka" IDS_2050 "Kritična napaka" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Pritisnite CTRL+ALT+PAGE DOWN za povratek iz celozaslonskega načina." IDS_2053 "Hitrost" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 2dd422f15..376182f27 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Hata" IDS_2050 "Kritik hata" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "Pencere moduna geri dönmek için CTRL+ALT+PAGE DOWN tuşlarına basın." IDS_2053 "Hız" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc index a752a5add..10a2c6e59 100644 --- a/src/win/languages/uk-UA.rc +++ b/src/win/languages/uk-UA.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "Помилка" IDS_2050 "Непереробна помилка" - IDS_2051 "<зарезервовано>" + IDS_2051 " - PAUSED" IDS_2052 "Натисніть CTRL + ALT + PAGE DOWN для повернення у віконний режим." IDS_2053 "Швидкість" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 5ce2fcccb..f8e519ab2 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -371,7 +371,7 @@ BEGIN 2048 "86Box" IDS_2049 "错误" IDS_2050 "致命错误" - IDS_2051 "" + IDS_2051 " - PAUSED" IDS_2052 "按 CTRL+ALT+PAGE DOWN 组合键返回到窗口模式。" IDS_2053 "速度" IDS_2054 "ZIP %03i %i (%s): %ls" diff --git a/src/win/win_ui.c b/src/win/win_ui.c index a1616200b..6f0301d09 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1505,7 +1505,7 @@ plat_pause(int p) if (p) { wcsncpy(oldtitle, ui_window_title(NULL), sizeof_w(oldtitle) - 1); wcscpy(title, oldtitle); - wcscat(title, L" - PAUSED -"); + wcscat(title, plat_get_string(IDS_2051)); ui_window_title(title); } else { ui_window_title(oldtitle); From 93ac1b7b522041d580cc454b3afd3fc283116930 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 07:09:30 +0500 Subject: [PATCH 20/23] Unify the naming of Page Up and Page Down keys --- src/include/86box/language.h | 2 +- src/qt/languages/cs-CZ.po | 8 ++++---- src/qt/languages/de-DE.po | 6 +++--- src/qt/languages/en-GB.po | 8 ++++---- src/qt/languages/en-US.po | 8 ++++---- src/qt/languages/es-ES.po | 8 ++++---- src/qt/languages/fi-FI.po | 8 ++++---- src/qt/languages/fr-FR.po | 8 ++++---- src/qt/languages/hr-HR.po | 8 ++++---- src/qt/languages/hu-HU.po | 8 ++++---- src/qt/languages/it-IT.po | 8 ++++---- src/qt/languages/ja-JP.po | 8 ++++---- src/qt/languages/ko-KR.po | 8 ++++---- src/qt/languages/pl-PL.po | 8 ++++---- src/qt/languages/pt-BR.po | 8 ++++---- src/qt/languages/pt-PT.po | 8 ++++---- src/qt/languages/ru-RU.po | 8 ++++---- src/qt/languages/sl-SI.po | 8 ++++---- src/qt/languages/tr-TR.po | 8 ++++---- src/qt/languages/uk-UA.po | 8 ++++---- src/qt/languages/zh-CN.po | 8 ++++---- src/qt/qt_mainwindow.cpp | 2 +- src/qt/qt_progsettings.hpp | 2 +- src/win/languages/cs-CZ.rc | 4 ++-- src/win/languages/de-DE.rc | 2 +- src/win/languages/en-GB.rc | 4 ++-- src/win/languages/en-US.rc | 4 ++-- src/win/languages/es-ES.rc | 4 ++-- src/win/languages/fi-FI.rc | 4 ++-- src/win/languages/fr-FR.rc | 4 ++-- src/win/languages/hr-HR.rc | 4 ++-- src/win/languages/hu-HU.rc | 4 ++-- src/win/languages/it-IT.rc | 4 ++-- src/win/languages/ja-JP.rc | 4 ++-- src/win/languages/ko-KR.rc | 4 ++-- src/win/languages/pl-PL.rc | 4 ++-- src/win/languages/pt-BR.rc | 4 ++-- src/win/languages/pt-PT.rc | 4 ++-- src/win/languages/ru-RU.rc | 4 ++-- src/win/languages/sl-SI.rc | 4 ++-- src/win/languages/tr-TR.rc | 4 ++-- src/win/languages/uk-UA.rc | 4 ++-- src/win/languages/zh-CN.rc | 4 ++-- 43 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/include/86box/language.h b/src/include/86box/language.h index ec11cfbae..5e4f8de0a 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -25,7 +25,7 @@ #define IDS_2049 2049 // "Error" #define IDS_2050 2050 // "Fatal error" #define IDS_2051 2051 // " - PAUSED" -#define IDS_2052 2052 // "Press CTRL+ALT+PAGE DOWN..." +#define IDS_2052 2052 // "Press Ctrl+Alt+PgDn..." #define IDS_2053 2053 // "Speed" #define IDS_2054 2054 // "ZIP %i (%03i): %ls" #define IDS_2055 2055 // "ZIP images (*.IM?)\0*.IM..." diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 466d4952a..c1da0a99a 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -88,8 +88,8 @@ msgstr "&Lineární" msgid "Hi&DPI scaling" msgstr "Š&kálování HiDPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Celá obrazovka\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Celá obrazovka\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Režím roztá&hnutí při celé obrazovce" @@ -601,8 +601,8 @@ msgstr "Kritická chyba" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Stiskněte Ctrl+Alt+Page Down pro návrat z režimu celé obrazovky." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Stiskněte Ctrl+Alt+PgDn pro návrat z režimu celé obrazovky." msgid "Speed" msgstr "Rychlost" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 55b76baff..398eb8b85 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Hi&DPI-Skalierung" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Vollbild\tStrg+Alt+BildAuf" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Vollbild\tStrg+Alt+Bild auf" msgid "Fullscreen &stretch mode" msgstr "&Stretching-Modus im Vollbildmodus" @@ -601,7 +601,7 @@ msgstr "Fataler Fehler" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." msgstr "Bitte Strg+Alt+Bild ab zur Rückkehr in den Fenstermodus drücken." msgid "Speed" diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po index c1ab8aad1..d38521682 100644 --- a/src/qt/languages/en-GB.po +++ b/src/qt/languages/en-GB.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Hi&DPI scaling" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Fullscreen\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Fullscreen\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Fullscreen &stretch mode" @@ -601,8 +601,8 @@ msgstr "Fatal error" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Press CTRL+ALT+PAGE DOWN to return to windowed mode." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Press Ctrl+Alt+PgDn to return to windowed mode." msgid "Speed" msgstr "Speed" diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po index af8fb3a59..7a80bd198 100644 --- a/src/qt/languages/en-US.po +++ b/src/qt/languages/en-US.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Hi&DPI scaling" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Fullscreen\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Fullscreen\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Fullscreen &stretch mode" @@ -601,8 +601,8 @@ msgstr "Fatal error" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Press CTRL+ALT+PAGE DOWN to return to windowed mode." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Press Ctrl+Alt+PgDn to return to windowed mode." msgid "Speed" msgstr "Speed" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index ab519f139..fe6427153 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -88,8 +88,8 @@ msgstr "&Lineal" msgid "Hi&DPI scaling" msgstr "&Escalado alta densidad" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Pantalla completa\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Pantalla completa\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Escalado pantalla completa" @@ -601,8 +601,8 @@ msgstr "Error fatal" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Pulsa CTRL+ALT+AVPÁG para volver a modo ventana." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Pulsa Ctrl+Alt+PgDn para volver a modo ventana." msgid "Speed" msgstr "Velocidad" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 90bc5946b..67223b67d 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -88,8 +88,8 @@ msgstr "Li&neaarinen interpolaatio" msgid "Hi&DPI scaling" msgstr "&Suuri DPI-skaalaus" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Koko näytön tila\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Koko näytön tila\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Koko näytön &skaalaustila" @@ -601,8 +601,8 @@ msgstr "Vakava virhe" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Paina CTRL+ALT+PAGE DOWN palataksesi ikkunoituun tilaan." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Paina Ctrl+Alt+PgDn palataksesi ikkunoituun tilaan." msgid "Speed" msgstr "Nopeus" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 71441e9c0..c5065a07d 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -88,8 +88,8 @@ msgstr "&Lineaire" msgid "Hi&DPI scaling" msgstr "Mise à l'échelle Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Plein Ecran\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Plein Ecran\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Mode &Elargi plein écran" @@ -601,8 +601,8 @@ msgstr "Erreur fatale" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Appuyez sur CTRL+ALT+PAGE ↓ pour revenir au mode fenêtré." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Appuyez sur Ctrl+Alt+PgDn pour revenir au mode fenêtré." msgid "Speed" msgstr "Vitesse" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index 3bcc1410b..3d4b96c94 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -88,8 +88,8 @@ msgstr "&Linearna" msgid "Hi&DPI scaling" msgstr "&HiDPI skaliranje" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Cijelozaslonski način\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Cijelozaslonski način\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "&Način cijelozaslonskog rastezanja" @@ -601,8 +601,8 @@ msgstr "Fatalna greška" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Pritisnite CTRL+ALT+PAGE DOWN za povratak u prozorski način rada." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Pritisnite Ctrl+Alt+PgDn za povratak u prozorski način rada." msgid "Speed" msgstr "Brzina" diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index bf7ffcad1..875d30ef1 100644 --- a/src/qt/languages/hu-HU.po +++ b/src/qt/languages/hu-HU.po @@ -88,8 +88,8 @@ msgstr "&Lineáris" msgid "Hi&DPI scaling" msgstr "Hi&DPI méretezés" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Teljes képernyő\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Teljes képernyő\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Teljes képernyős &méretezés" @@ -601,8 +601,8 @@ msgstr "Végzetes hiba" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Használja a CTRL+ALT+PAGE DOWN gombokat az ablakhoz való visszatéréshez." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Használja a Ctrl+Alt+PgDn gombokat az ablakhoz való visszatéréshez." msgid "Speed" msgstr "Sebesség" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index e4ea724ac..49ecf1762 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -88,8 +88,8 @@ msgstr "&Lineare" msgid "Hi&DPI scaling" msgstr "Scala Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Schermo intero\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Schermo intero\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Modalità adattamento &schermo intero" @@ -601,8 +601,8 @@ msgstr "Errore fatale" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Usa CTRL+ALT+PAGE DOWN per tornare alla modalità finestra." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Usa Ctrl+Alt+PgDn per tornare alla modalità finestra." msgid "Speed" msgstr "Velocità" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index e9376167c..018ae5b49 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -88,8 +88,8 @@ msgstr "線形補間(&L)" msgid "Hi&DPI scaling" msgstr "HiDPIスケーリング(&D)" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "フルスクリーン(&F)\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "フルスクリーン(&F)\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "フルスクリーンのスケール(&S)" @@ -601,8 +601,8 @@ msgstr "致命的なエラー" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "CTRL+ALT+PAGE DOWNでウィンドウモードに戻ります。" +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Ctrl+Alt+PgDnでウィンドウモードに戻ります。" msgid "Speed" msgstr "速度" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index e84d6927f..02e4f82d4 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -88,8 +88,8 @@ msgstr "선형 보간법(&L)" msgid "Hi&DPI scaling" msgstr "HiDPI 스케일링(&D)" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "전체 화면(&F)\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "전체 화면(&F)\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "전체 화면 비율(&S)" @@ -601,8 +601,8 @@ msgstr "치명적인 오류" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "CTRL+ALT+PAGE DOWN 키를 누르면 창 모드로 전환합니다." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Ctrl+Alt+PgDn 키를 누르면 창 모드로 전환합니다." msgid "Speed" msgstr "속도" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 9c0bef67c..345911a03 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Skalowanie Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Pełny ekran\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Pełny ekran\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Fullscreen &stretch mode" @@ -601,8 +601,8 @@ msgstr "Fatalny błąd" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Naciśnij klawisze CTRL+ALT+PAGE DOWN aby wrócić to trybu okna." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Naciśnij klawisze Ctrl+Alt+PgDn aby wrócić to trybu okna." msgid "Speed" msgstr "Szybkość" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 80813d678..590bac99b 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Escala Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Tela cheia\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Tela cheia\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Modo de &redimensionamento da tela cheia" @@ -601,8 +601,8 @@ msgstr "Erro fatal" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Use CTRL+ALT+PAGE DOWN para retornar ao modo janela" +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Use Ctrl+Alt+PgDn para retornar ao modo janela" msgid "Speed" msgstr "Velocidade" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index 36583c02e..c82ddbb5f 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -88,8 +88,8 @@ msgstr "&Linear" msgid "Hi&DPI scaling" msgstr "Escala Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "E&crã cheio\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "E&crã cheio\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Modo &de estiramento em ecrã cheio" @@ -601,8 +601,8 @@ msgstr "Erro fatal" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Pressione CTRL+ALT+PAGE DOWN para voltar ao modo de janela." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Pressione Ctrl+Alt+PgDn para voltar ao modo de janela." msgid "Speed" msgstr "Velocidade" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index ccc28fd21..77df4c9b1 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -88,8 +88,8 @@ msgstr "&Линейный" msgid "Hi&DPI scaling" msgstr "Масштабирование Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Полноэкранный режим\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Полноэкранный режим\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "&Растягивание в полноэкранном режиме" @@ -601,8 +601,8 @@ msgstr "Неустранимая ошибка" msgid " - PAUSED" msgstr " - ПАУЗА" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Нажмите CTRL + ALT + PAGE DOWN для возврата в оконный режим." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Нажмите Ctrl+Alt+PgDn для возврата в оконный режим." msgid "Speed" msgstr "Скорость" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 690924f64..716199510 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -88,8 +88,8 @@ msgstr "&Linearna" msgid "Hi&DPI scaling" msgstr "&Raztezanje za visok DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Celozaslonski način\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Celozaslonski način\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "&Način celozaslonskega raztezanja" @@ -601,8 +601,8 @@ msgstr "Kritična napaka" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Pritisnite CTRL+ALT+PAGE DOWN za povratek iz celozaslonskega načina." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Pritisnite Ctrl+Alt+PgDn za povratek iz celozaslonskega načina." msgid "Speed" msgstr "Hitrost" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index 895fc0812..af8c2fa40 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -88,8 +88,8 @@ msgstr "&Linear (Doğrusal)" msgid "Hi&DPI scaling" msgstr "Hi&DPI ölçeklemesi" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Tam ekran\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Tam ekran\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "Tam ekran &germe modu" @@ -601,8 +601,8 @@ msgstr "Kritik hata" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Pencere moduna geri dönmek için CTRL+ALT+PAGE DOWN tuşlarına basın." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Pencere moduna geri dönmek için Ctrl+Alt+PgDn tuşlarına basın." msgid "Speed" msgstr "Hız" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index c945a08f4..563c7166b 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -88,8 +88,8 @@ msgstr "&Лінійний" msgid "Hi&DPI scaling" msgstr "Масштабування Hi&DPI" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "&Повноекранний режим\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "&Повноекранний режим\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "&Розстягування у повноекранному режимі" @@ -601,8 +601,8 @@ msgstr "Непереробна помилка" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "Натисніть CTRL + ALT + PAGE DOWN для повернення у віконний режим." +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "Натисніть Ctrl+Alt+PgDn для повернення у віконний режим." msgid "Speed" msgstr "Швидкість" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 72e8b394c..ff6efdeb4 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -88,8 +88,8 @@ msgstr "线性(&L)" msgid "Hi&DPI scaling" msgstr "HiDPI 缩放(&D)" -msgid "&Fullscreen\tCtrl+Alt+PageUP" -msgstr "全屏(&F)\tCtrl+Alt+PageUP" +msgid "&Fullscreen\tCtrl+Alt+PgUp" +msgstr "全屏(&F)\tCtrl+Alt+PgUp" msgid "Fullscreen &stretch mode" msgstr "全屏拉伸模式(&S)" @@ -601,8 +601,8 @@ msgstr "致命错误" msgid " - PAUSED" msgstr " - PAUSED" -msgid "Press CTRL+ALT+PAGE DOWN to return to windowed mode." -msgstr "按 CTRL+ALT+PAGE DOWN 组合键返回到窗口模式。" +msgid "Press Ctrl+Alt+PgDn to return to windowed mode." +msgstr "按 Ctrl+Alt+PgDn 组合键返回到窗口模式。" msgid "Speed" msgstr "速度" diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 311cd4b58..80a3792c3 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1094,7 +1094,7 @@ void MainWindow::on_actionFullscreen_triggered() { } else { if (video_fullscreen_first) { - QMessageBox questionbox(QMessageBox::Icon::Information, tr("Entering fullscreen mode"), tr("Press CTRL+ALT+PAGE DOWN to return to windowed mode."), QMessageBox::Ok, this); + QMessageBox questionbox(QMessageBox::Icon::Information, tr("Entering fullscreen mode"), tr("Press Ctrl+Alt+PgDn to return to windowed mode."), QMessageBox::Ok, this); QCheckBox *chkbox = new QCheckBox(tr("Don't show this message again")); questionbox.setCheckBox(chkbox); chkbox->setChecked(!video_fullscreen_first); diff --git a/src/qt/qt_progsettings.hpp b/src/qt/qt_progsettings.hpp index 39b3e6819..d0cbcc5d2 100644 --- a/src/qt/qt_progsettings.hpp +++ b/src/qt/qt_progsettings.hpp @@ -27,7 +27,7 @@ public: QString translate(const char *context, const char *sourceText, const char *disambiguation = nullptr, int n = -1) const override { - if (strcmp(sourceText, "&Fullscreen") == 0) sourceText = "&Fullscreen\tCtrl+Alt+PageUP"; + if (strcmp(sourceText, "&Fullscreen") == 0) sourceText = "&Fullscreen\tCtrl+Alt+PgUp"; if (strcmp(sourceText, "&Ctrl+Alt+Del") == 0) sourceText = "&Ctrl+Alt+Del\tCtrl+F12"; if (strcmp(sourceText, "Take s&creenshot") == 0) sourceText = "Take s&creenshot\tCtrl+F11"; if (strcmp(sourceText, "Begin trace") == 0) sourceText = "Begin trace\tCtrl+T"; diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index a6bb0b691..9e1924c4d 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Š&kálování HiDPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Celá obrazovka\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Celá obrazovka\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Režím roztá&hnutí při celé obrazovce" BEGIN MENUITEM "&Roztáhnout", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Chyba" IDS_2050 "Kritická chyba" IDS_2051 " - PAUSED" - IDS_2052 "Stiskněte Ctrl+Alt+Page Down pro návrat z režimu celé obrazovky." + IDS_2052 "Stiskněte Ctrl+Alt+PgDn pro návrat z režimu celé obrazovky." IDS_2053 "Rychlost" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Obrazy ZIP disků (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index d68a31ef6..d90b37d50 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Hi&DPI-Skalierung", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Vollbild\tStrg+Alt+BildAuf", IDM_VID_FULLSCREEN + MENUITEM "&Vollbild\tStrg+Alt+Bild auf", IDM_VID_FULLSCREEN POPUP "&Stretching-Modus im Vollbildmodus" BEGIN MENUITEM "&Vollbild-Stretching", IDM_VID_FS_FULL diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 814e0c1fc..bc78808be 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Fullscreen\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Fullscreen &stretch mode" BEGIN MENUITEM "&Full screen stretch", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Error" IDS_2050 "Fatal error" IDS_2051 " - PAUSED" - IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." + IDS_2052 "Press Ctrl+Alt+PgDn to return to windowed mode." IDS_2053 "Speed" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index bd8e1c92c..08e94242c 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Hi&DPI scaling", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Fullscreen\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Fullscreen\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Fullscreen &stretch mode" BEGIN MENUITEM "&Full screen stretch", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Error" IDS_2050 "Fatal error" IDS_2051 " - PAUSED" - IDS_2052 "Press CTRL+ALT+PAGE DOWN to return to windowed mode." + IDS_2052 "Press Ctrl+Alt+PgDn to return to windowed mode." IDS_2053 "Speed" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index a1da99f59..b35f4623c 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "&Escalado alta densidad", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Pantalla completa\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Pantalla completa\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Escalado pantalla completa" BEGIN MENUITEM "&Estirar", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Error" IDS_2050 "Error fatal" IDS_2051 " - PAUSED" - IDS_2052 "Pulsa CTRL+ALT+AVPÁG para volver a modo ventana." + IDS_2052 "Pulsa Ctrl+Alt+PgDn para volver a modo ventana." IDS_2053 "Velocidad" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Imagenes ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index e8c5fab0a..82b942863 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "&Suuri DPI-skaalaus", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Koko näytön tila\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Koko näytön tila\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Koko näytön &skaalaustila" BEGIN MENUITEM "&Venytä koko näyttöön", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Virhe" IDS_2050 "Vakava virhe" IDS_2051 " - PAUSED" - IDS_2052 "Paina CTRL+ALT+PAGE DOWN palataksesi ikkunoituun tilaan." + IDS_2052 "Paina Ctrl+Alt+PgDn palataksesi ikkunoituun tilaan." IDS_2053 "Nopeus" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP-levykuvat (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 60d07c596..66842e811 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Mise à l'échelle Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Plein Ecran\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Plein Ecran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Mode &Elargi plein écran" BEGIN MENUITEM "&Plein écran étiré", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Erreur" IDS_2050 "Erreur fatale" IDS_2051 " - PAUSED" - IDS_2052 "Appuyez sur CTRL+ALT+PAGE ↓ pour revenir au mode fenêtré." + IDS_2052 "Appuyez sur Ctrl+Alt+PgDn pour revenir au mode fenêtré." IDS_2053 "Vitesse" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Images ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index c85ff894a..5f079a2f5 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "&HiDPI skaliranje", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Cijelozaslonski način\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Cijelozaslonski način\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "&Način cijelozaslonskog rastezanja" BEGIN MENUITEM "&Razvuci na cijeli zaslona", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Greška" IDS_2050 "Fatalna greška" IDS_2051 " - PAUSED" - IDS_2052 "Pritisnite CTRL+ALT+PAGE DOWN za povratak u prozorski način rada." + IDS_2052 "Pritisnite Ctrl+Alt+PgDn za povratak u prozorski način rada." IDS_2053 "Brzina" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index dd3b84654..262ee22ce 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -69,7 +69,7 @@ BEGIN END MENUITEM "Hi&DPI méretezés", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Teljes képernyő\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Teljes képernyő\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Teljes képernyős &méretezés" BEGIN MENUITEM "&Nyújtás a teljes képernyőre", IDM_VID_FS_FULL @@ -377,7 +377,7 @@ BEGIN IDS_2049 "Hiba" IDS_2050 "Végzetes hiba" IDS_2051 " - PAUSED" - IDS_2052 "Használja a CTRL+ALT+PAGE DOWN gombokat az ablakhoz való visszatéréshez." + IDS_2052 "Használja a Ctrl+Alt+PgDn gombokat az ablakhoz való visszatéréshez." IDS_2053 "Sebesség" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP-lemezképek (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 54d098a48..fa1a23b0d 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -65,7 +65,7 @@ BEGIN END MENUITEM "Scala Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Schermo intero\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Schermo intero\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Modalità adattamento &schermo intero" BEGIN MENUITEM "&Adatta a schermo intero", IDM_VID_FS_FULL @@ -373,7 +373,7 @@ BEGIN IDS_2049 "Errore" IDS_2050 "Errore fatale" IDS_2051 " - PAUSED" - IDS_2052 "Usa CTRL+ALT+PAGE DOWN per tornare alla modalità finestra." + IDS_2052 "Usa Ctrl+Alt+PgDn per tornare alla modalità finestra." IDS_2053 "Velocità" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Immagini ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 3107a231a..054dc9566 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "HiDPIスケーリング(&D)", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "フルスクリーン(&F)\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "フルスクリーン(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "フルスクリーンのスケール(&S)" BEGIN MENUITEM "フルスクリーンに拡大(&F)", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "エラー" IDS_2050 "致命的なエラー" IDS_2051 " - PAUSED" - IDS_2052 "CTRL+ALT+PAGE DOWNでウィンドウモードに戻ります。" + IDS_2052 "Ctrl+Alt+PgDnでウィンドウモードに戻ります。" IDS_2053 "速度" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIPイメージ (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index e180829d8..68ac210e9 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "HiDPI 스케일링(&D)", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "전체 화면(&F)\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "전체 화면(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "전체 화면 비율(&S)" BEGIN MENUITEM "전체 화면으로 확대(&F)", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "오류" IDS_2050 "치명적인 오류" IDS_2051 " - PAUSED" - IDS_2052 "CTRL+ALT+PAGE DOWN 키를 누르면 창 모드로 전환합니다." + IDS_2052 "Ctrl+Alt+PgDn 키를 누르면 창 모드로 전환합니다." IDS_2053 "속도" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP 이미지 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index bc9b82623..5534aad6c 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Skalowanie Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Pełny ekran\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Pełny ekran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Fullscreen &stretch mode" BEGIN MENUITEM "&Tryb rozciągania na pełnym ekranie", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Błąd" IDS_2050 "Fatalny błąd" IDS_2051 " - PAUSED" - IDS_2052 "Naciśnij klawisze CTRL+ALT+PAGE DOWN aby wrócić to trybu okna." + IDS_2052 "Naciśnij klawisze Ctrl+Alt+PgDn aby wrócić to trybu okna." IDS_2053 "Szybkość" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Obrazy ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index df42b3a30..68b7e0582 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -67,7 +67,7 @@ BEGIN END MENUITEM "Escala Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Tela cheia\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Tela cheia\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Modo de &redimensionamento da tela cheia" BEGIN MENUITEM "&Tela cheia esticada", IDM_VID_FS_FULL @@ -375,7 +375,7 @@ BEGIN IDS_2049 "Erro" IDS_2050 "Erro fatal" IDS_2051 " - PAUSED" - IDS_2052 "Use CTRL+ALT+PAGE DOWN para retornar ao modo janela" + IDS_2052 "Use Ctrl+Alt+PgDn para retornar ao modo janela" IDS_2053 "Velocidade" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 3178c954a..373444107 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Escala Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "E&crã cheio\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "E&crã cheio\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Modo &de estiramento em ecrã cheio" BEGIN MENUITEM "&Estiramento em ecrã cheio", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Erro" IDS_2050 "Erro fatal" IDS_2051 " - PAUSED" - IDS_2052 "Pressione CTRL+ALT+PAGE DOWN para voltar ao modo de janela." + IDS_2052 "Pressione Ctrl+Alt+PgDn para voltar ao modo de janela." IDS_2053 "Velocidade" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Imagens ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index c9f2db3a7..b47942377 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Масштабирование Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Полноэкранный режим\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Полноэкранный режим\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "&Растягивание в полноэкранном режиме" BEGIN MENUITEM "&На весь экран", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Ошибка" IDS_2050 "Неустранимая ошибка" IDS_2051 " - ПАУЗА" - IDS_2052 "Нажмите CTRL + ALT + PAGE DOWN для возврата в оконный режим." + IDS_2052 "Нажмите Ctrl+Alt+PgDn для возврата в оконный режим." IDS_2053 "Скорость" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Образы ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 0571f36b0..74e9ce896 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "&Raztezanje za visok DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Celozaslonski način\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Celozaslonski način\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "&Način celozaslonskega raztezanja" BEGIN MENUITEM "&Raztegni na celoten zaslon", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Napaka" IDS_2050 "Kritična napaka" IDS_2051 " - PAUSED" - IDS_2052 "Pritisnite CTRL+ALT+PAGE DOWN za povratek iz celozaslonskega načina." + IDS_2052 "Pritisnite Ctrl+Alt+PgDn za povratek iz celozaslonskega načina." IDS_2053 "Hitrost" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP slike (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 376182f27..7f5770a2f 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Hi&DPI ölçeklemesi", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Tam ekran\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Tam ekran\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "Tam ekran &germe modu" BEGIN MENUITEM "&Tam ekrana ger", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Hata" IDS_2050 "Kritik hata" IDS_2051 " - PAUSED" - IDS_2052 "Pencere moduna geri dönmek için CTRL+ALT+PAGE DOWN tuşlarına basın." + IDS_2052 "Pencere moduna geri dönmek için Ctrl+Alt+PgDn tuşlarına basın." IDS_2053 "Hız" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP imajları (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc index 10a2c6e59..fcc32a088 100644 --- a/src/win/languages/uk-UA.rc +++ b/src/win/languages/uk-UA.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "Масштабування Hi&DPI", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "&Повноекранний режим\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "&Повноекранний режим\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "&Розстягування у повноекранному режимі" BEGIN MENUITEM "&На весь екран", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "Помилка" IDS_2050 "Непереробна помилка" IDS_2051 " - PAUSED" - IDS_2052 "Натисніть CTRL + ALT + PAGE DOWN для повернення у віконний режим." + IDS_2052 "Натисніть Ctrl+Alt+PgDn для повернення у віконний режим." IDS_2053 "Швидкість" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "Образи ZIP (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index f8e519ab2..5791bccd9 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -64,7 +64,7 @@ BEGIN END MENUITEM "HiDPI 缩放(&D)", IDM_VID_HIDPI MENUITEM SEPARATOR - MENUITEM "全屏(&F)\tCtrl+Alt+PageUP", IDM_VID_FULLSCREEN + MENUITEM "全屏(&F)\tCtrl+Alt+PgUp", IDM_VID_FULLSCREEN POPUP "全屏拉伸模式(&S)" BEGIN MENUITEM "全屏拉伸(&F)", IDM_VID_FS_FULL @@ -372,7 +372,7 @@ BEGIN IDS_2049 "错误" IDS_2050 "致命错误" IDS_2051 " - PAUSED" - IDS_2052 "按 CTRL+ALT+PAGE DOWN 组合键返回到窗口模式。" + IDS_2052 "按 Ctrl+Alt+PgDn 组合键返回到窗口模式。" IDS_2053 "速度" IDS_2054 "ZIP %03i %i (%s): %ls" IDS_2055 "ZIP 镜像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0" From c2b0ed4fcd4ce0edfa086ed72664b1b03d10cee2 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 08:22:23 +0500 Subject: [PATCH 21/23] Remove superfluous "M.O." from MO related strings and make the "b" in Mb/Gb uppercase --- src/include/86box/language.h | 20 +++++++++--------- src/qt/languages/cs-CZ.po | 40 +++++++++++++++++------------------ src/qt/languages/de-DE.po | 40 +++++++++++++++++------------------ src/qt/languages/en-GB.po | 40 +++++++++++++++++------------------ src/qt/languages/en-US.po | 40 +++++++++++++++++------------------ src/qt/languages/es-ES.po | 40 +++++++++++++++++------------------ src/qt/languages/fi-FI.po | 40 +++++++++++++++++------------------ src/qt/languages/fr-FR.po | 40 +++++++++++++++++------------------ src/qt/languages/hr-HR.po | 40 +++++++++++++++++------------------ src/qt/languages/hu-HU.po | 40 +++++++++++++++++------------------ src/qt/languages/it-IT.po | 40 +++++++++++++++++------------------ src/qt/languages/ja-JP.po | 40 +++++++++++++++++------------------ src/qt/languages/ko-KR.po | 40 +++++++++++++++++------------------ src/qt/languages/pl-PL.po | 40 +++++++++++++++++------------------ src/qt/languages/pt-BR.po | 40 +++++++++++++++++------------------ src/qt/languages/pt-PT.po | 40 +++++++++++++++++------------------ src/qt/languages/ru-RU.po | 40 +++++++++++++++++------------------ src/qt/languages/sl-SI.po | 40 +++++++++++++++++------------------ src/qt/languages/tr-TR.po | 40 +++++++++++++++++------------------ src/qt/languages/uk-UA.po | 40 +++++++++++++++++------------------ src/qt/languages/zh-CN.po | 40 +++++++++++++++++------------------ src/qt/qt_newfloppydialog.cpp | 20 +++++++++--------- src/win/languages/cs-CZ.rc | 20 +++++++++--------- src/win/languages/de-DE.rc | 20 +++++++++--------- src/win/languages/en-GB.rc | 20 +++++++++--------- src/win/languages/en-US.rc | 20 +++++++++--------- src/win/languages/es-ES.rc | 20 +++++++++--------- src/win/languages/fi-FI.rc | 20 +++++++++--------- src/win/languages/fr-FR.rc | 20 +++++++++--------- src/win/languages/hr-HR.rc | 20 +++++++++--------- src/win/languages/hu-HU.rc | 20 +++++++++--------- src/win/languages/it-IT.rc | 20 +++++++++--------- src/win/languages/ja-JP.rc | 20 +++++++++--------- src/win/languages/ko-KR.rc | 20 +++++++++--------- src/win/languages/pl-PL.rc | 20 +++++++++--------- src/win/languages/pt-BR.rc | 20 +++++++++--------- src/win/languages/pt-PT.rc | 20 +++++++++--------- src/win/languages/ru-RU.rc | 20 +++++++++--------- src/win/languages/sl-SI.rc | 20 +++++++++--------- src/win/languages/tr-TR.rc | 20 +++++++++--------- src/win/languages/uk-UA.rc | 20 +++++++++--------- src/win/languages/zh-CN.rc | 20 +++++++++--------- 42 files changed, 620 insertions(+), 620 deletions(-) diff --git a/src/include/86box/language.h b/src/include/86box/language.h index 5e4f8de0a..9a5397c6b 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -222,16 +222,16 @@ #define IDS_5899 5899 // "2.88 MB" #define IDS_5900 5900 // "ZIP 100" #define IDS_5901 5901 // "ZIP 250" -#define IDS_5902 5902 // "3.5\" 128Mb M.O. (ISO 10090)" -#define IDS_5903 5903 // "3.5\" 230Mb M.O. (ISO 13963)" -#define IDS_5904 5904 // "3.5\" 540Mb M.O. (ISO 15498)" -#define IDS_5905 5905 // "3.5\" 640Mb M.O. (ISO 15498)" -#define IDS_5906 5906 // "3.5\" 1.3Gb M.O. (GigaMO)" -#define IDS_5907 5907 // "3.5\" 2.3Gb M.O. (GigaMO 2)" -#define IDS_5908 5908 // "5.25\" 600Mb M.O." -#define IDS_5909 5909 // "5.25\" 650Mb M.O." -#define IDS_5910 5910 // "5.25\" 1Gb M.O." -#define IDS_5911 5911 // "5.25\" 1.3Gb M.O." +#define IDS_5902 5902 // "3.5\" 128 MB (ISO 10090)" +#define IDS_5903 5903 // "3.5\" 230 MB (ISO 13963)" +#define IDS_5904 5904 // "3.5\" 540 MB (ISO 15498)" +#define IDS_5905 5905 // "3.5\" 640 MB (ISO 15498)" +#define IDS_5906 5906 // "3.5\" 1.3 GB (GigaMO)" +#define IDS_5907 5907 // "3.5\" 2.3 GB (GigaMO 2)" +#define IDS_5908 5908 // "5.25\" 600 MB" +#define IDS_5909 5909 // "5.25\" 650 MB" +#define IDS_5910 5910 // "5.25\" 1 GB" +#define IDS_5911 5911 // "5.25\" 1.3 GB" #define IDS_6144 6144 // "Perfect RPM" #define IDS_6145 6145 // "1%% below perfect RPM" diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index c1da0a99a..050a29224 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Dokonalé otáčky za minutu" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 398eb8b85..dad99d911 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -1138,35 +1138,35 @@ msgstr "2,88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3,5-Zoll 128 MB M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3,5-Zoll 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3,5-Zoll 230 MB M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3,5-Zoll 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3,5-Zoll 540 MB M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3,5-Zoll 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3,5-Zoll 640 MB M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3,5-Zoll 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3,5-Zoll 1,3 GB M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3,5-Zoll 1,3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3,5-Zoll 2,3 GB M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3,5-Zoll 2,3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5,25-Zoll 600 MB M.O." +msgid "5.25\" 600 MB" +msgstr "5,25-Zoll 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5,25-Zoll 650 MB M.O." +msgid "5.25\" 650 MB" +msgstr "5,25-Zoll 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5,25-Zoll 1 GB M.O." +msgid "5.25\" 1 GB" +msgstr "5,25-Zoll 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5,25-Zoll 1,3 GB M.O." +msgid "5.25\" 1.3 GB" +msgstr "5,25-Zoll 1,3 GB" msgid "Perfect RPM" msgstr "Perfekte Drehzahl" diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po index d38521682..f38d8ad8a 100644 --- a/src/qt/languages/en-GB.po +++ b/src/qt/languages/en-GB.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Perfect RPM" diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po index 7a80bd198..ae3fb5234 100644 --- a/src/qt/languages/en-US.po +++ b/src/qt/languages/en-US.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Perfect RPM" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index fe6427153..e304fd1db 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfectas" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 67223b67d..980bb493e 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -1138,35 +1138,35 @@ msgstr "2.88 Mt" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mt M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 Mt (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mt M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 Mt (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mt M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 Mt (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mt M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 Mt (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gt M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 Gt (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gt M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 Gt (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mt M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 Mt" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mt M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 Mt" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gt M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 Gt" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gt M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 Gt" msgid "Perfect RPM" msgstr "Täydellinen RPM" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index c5065a07d..0b016252d 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 Mo (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 Mo (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 Mo (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 Mo (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 Go (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 Go (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 Mo" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 Mo" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 Go" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 Go" msgid "Perfect RPM" msgstr "RPM précis" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index 3d4b96c94..3c95cbe41 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -1138,35 +1138,35 @@ msgstr "2,88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3,5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3,5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3,5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3,5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3,5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3,5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3,5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3,5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3,5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3,5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3,5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3,5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5,25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5,25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5,25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5,25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5,25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5,25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5,25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5,25\" 1.3 GB" msgid "Perfect RPM" msgstr "Savršeni broj okretaja u minuti" diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index 875d30ef1..e26b6b3e0 100644 --- a/src/qt/languages/hu-HU.po +++ b/src/qt/languages/hu-HU.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Tökéletes RPM" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index 49ecf1762..ca42c4f25 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfette" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index 018ae5b49..5a0180bfa 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "規定の回転数" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 02e4f82d4..434b1d5db 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "완벽한 회전수" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 345911a03..76c89e316 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1138,35 +1138,35 @@ msgstr "2,88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1,3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1,3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2,3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2,3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1,3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1,3 GB" msgid "Perfect RPM" msgstr "Idealne obroty" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 590bac99b..e871588fa 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfeita" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index c82ddbb5f..e6c9f9615 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfeito" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index 77df4c9b1..347bbd05d 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -1138,35 +1138,35 @@ msgstr "2.88 МБ" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Мб M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 МБ (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Мб M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 МБ (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Мб M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 МБ (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Мб M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 МБ (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Гб M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 ГБ (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Гб M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 ГБ (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Мб M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 МБ" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Мб M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 МБ" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Гб M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 ГБ" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Гб M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 ГБ" msgid "Perfect RPM" msgstr "Точный RPM" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 716199510..8cba7f312 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Popolni obrati na minuto" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index af8c2fa40..99d6cead3 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Mb M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Mb M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Mb M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Mb M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Gb M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Gb M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Mb M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Mb M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Gb M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Gb M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Mükemmel RPM" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index 563c7166b..fce5f3874 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -1138,35 +1138,35 @@ msgstr "2.88 МБ" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5\" 128Мб M.O. (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5\" 128 МБ (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5\" 230Мб M.O. (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5\" 230 МБ (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5\" 540Мб M.O. (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5\" 540 МБ (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5\" 640Мб M.O. (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5\" 640 МБ (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5\" 1.3Гб M.O. (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5\" 1.3 ГБ (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5\" 2.3Гб M.O. (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5\" 2.3 ГБ (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25\" 600Мб M.O." +msgid "5.25\" 600 MB" +msgstr "5.25\" 600 МБ" -msgid "5.25\" 650Mb M.O." -msgstr "5.25\" 650Мб M.O." +msgid "5.25\" 650 MB" +msgstr "5.25\" 650 МБ" -msgid "5.25\" 1Gb M.O." -msgstr "5.25\" 1Гб M.O." +msgid "5.25\" 1 GB" +msgstr "5.25\" 1 ГБ" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25\" 1.3Гб M.O." +msgid "5.25\" 1.3 GB" +msgstr "5.25\" 1.3 ГБ" msgid "Perfect RPM" msgstr "Точний RPM" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index ff6efdeb4..22261e24c 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -1138,35 +1138,35 @@ msgstr "2.88 MB" msgid "ZIP 100" msgstr "ZIP 100" -msgid "3.5\" 128Mb M.O. (ISO 10090)" -msgstr "3.5 英寸 128Mb 磁光盘 (ISO 10090)" +msgid "3.5\" 128 MB (ISO 10090)" +msgstr "3.5 英寸 128 MB (ISO 10090)" -msgid "3.5\" 230Mb M.O. (ISO 13963)" -msgstr "3.5 英寸 230Mb 磁光盘 (ISO 13963)" +msgid "3.5\" 230 MB (ISO 13963)" +msgstr "3.5 英寸 230 MB (ISO 13963)" -msgid "3.5\" 540Mb M.O. (ISO 15498)" -msgstr "3.5 英寸 540Mb 磁光盘 (ISO 15498)" +msgid "3.5\" 540 MB (ISO 15498)" +msgstr "3.5 英寸 540 MB (ISO 15498)" -msgid "3.5\" 640Mb M.O. (ISO 15498)" -msgstr "3.5 英寸 640Mb 磁光盘 (ISO 15498)" +msgid "3.5\" 640 MB (ISO 15498)" +msgstr "3.5 英寸 640 MB (ISO 15498)" -msgid "3.5\" 1.3Gb M.O. (GigaMO)" -msgstr "3.5 英寸 1.3Gb 磁光盘 (GigaMO)" +msgid "3.5\" 1.3 GB (GigaMO)" +msgstr "3.5 英寸 1.3 GB (GigaMO)" -msgid "3.5\" 2.3Gb M.O. (GigaMO 2)" -msgstr "3.5 英寸 2.3Gb 磁光盘 (GigaMO 2)" +msgid "3.5\" 2.3 GB (GigaMO 2)" +msgstr "3.5 英寸 2.3 GB (GigaMO 2)" -msgid "5.25\" 600Mb M.O." -msgstr "5.25 英寸 600Mb 磁光盘" +msgid "5.25\" 600 MB" +msgstr "5.25 英寸 600 MB" -msgid "5.25\" 650Mb M.O." -msgstr "5.25 英寸 650Mb 磁光盘" +msgid "5.25\" 650 MB" +msgstr "5.25 英寸 650 MB" -msgid "5.25\" 1Gb M.O." -msgstr "5.25 英寸 1Gb 磁光盘" +msgid "5.25\" 1 GB" +msgstr "5.25 英寸 1 GB" -msgid "5.25\" 1.3Gb M.O." -msgstr "5.25 英寸 1.3Gb 磁光盘" +msgid "5.25\" 1.3 GB" +msgstr "5.25 英寸 1.3 GB" msgid "Perfect RPM" msgstr "标准转速 (RPM)" diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp index 1a9d1364a..26afa0f7c 100644 --- a/src/qt/qt_newfloppydialog.cpp +++ b/src/qt/qt_newfloppydialog.cpp @@ -97,16 +97,16 @@ static const QStringList zipTypes = { }; static const QStringList moTypes = { - "3.5\" 128Mb M.O. (ISO 10090)", - "3.5\" 230Mb M.O. (ISO 13963)", - "3.5\" 540Mb M.O. (ISO 15498)", - "3.5\" 640Mb M.O. (ISO 15498)", - "3.5\" 1.3Gb M.O. (GigaMO)", - "3.5\" 2.3Gb M.O. (GigaMO 2)", - "5.25\" 600Mb M.O.", - "5.25\" 650Mb M.O.", - "5.25\" 1Gb M.O.", - "5.25\" 1.3Gb M.O.", + "3.5\" 128 MB (ISO 10090)", + "3.5\" 230 MB (ISO 13963)", + "3.5\" 540 MB (ISO 15498)", + "3.5\" 640 MB (ISO 15498)", + "3.5\" 1.3 GB (GigaMO)", + "3.5\" 2.3 GB (GigaMO 2)", + "5.25\" 600 MB", + "5.25\" 650 MB", + "5.25\" 1 GB", + "5.25\" 1.3 GB", }; NewFloppyDialog::NewFloppyDialog(MediaType type, QWidget *parent) : diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 9e1924c4d..f7735c3e7 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Dokonalé otáčky za minutu" IDS_6145 "1%% pod dokonalými ot./m" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index d90b37d50..ca61b0d02 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2,88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3,5-Zoll 128 MB M.O. (ISO 10090)" - IDS_5903 "3,5-Zoll 230 MB M.O. (ISO 13963)" - IDS_5904 "3,5-Zoll 540 MB M.O. (ISO 15498)" - IDS_5905 "3,5-Zoll 640 MB M.O. (ISO 15498)" - IDS_5906 "3,5-Zoll 1,3 GB M.O. (GigaMO)" - IDS_5907 "3,5-Zoll 2,3 GB M.O. (GigaMO 2)" - IDS_5908 "5,25-Zoll 600 MB M.O." - IDS_5909 "5,25-Zoll 650 MB M.O." - IDS_5910 "5,25-Zoll 1 GB M.O." - IDS_5911 "5,25-Zoll 1,3 GB M.O." + IDS_5902 "3,5-Zoll 128 MB (ISO 10090)" + IDS_5903 "3,5-Zoll 230 MB (ISO 13963)" + IDS_5904 "3,5-Zoll 540 MB (ISO 15498)" + IDS_5905 "3,5-Zoll 640 MB (ISO 15498)" + IDS_5906 "3,5-Zoll 1,3 GB (GigaMO)" + IDS_5907 "3,5-Zoll 2,3 GB (GigaMO 2)" + IDS_5908 "5,25-Zoll 600 MB" + IDS_5909 "5,25-Zoll 650 MB" + IDS_5910 "5,25-Zoll 1 GB" + IDS_5911 "5,25-Zoll 1,3 GB" IDS_6144 "Perfekte Drehzahl" IDS_6145 "1%% unterhalb der perfekten Drehzahl" diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index bc78808be..268ff2bf6 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Perfect RPM" IDS_6145 "1%% below perfect RPM" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 08e94242c..bed5e341e 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Perfect RPM" IDS_6145 "1%% below perfect RPM" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index b35f4623c..85cfaa6b1 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfectas" IDS_6145 "1%% por debajo de RPM perfectas" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 82b942863..5be6a3541 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 Mt" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mt M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mt M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mt M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mt M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gt M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gt M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mt M.O." - IDS_5909 "5.25"" 650Mt M.O." - IDS_5910 "5.25"" 1Gt M.O." - IDS_5911 "5.25"" 1.3Gt M.O." + IDS_5902 "3.5"" 128 Mt (ISO 10090)" + IDS_5903 "3.5"" 230 Mt (ISO 13963)" + IDS_5904 "3.5"" 540 Mt (ISO 15498)" + IDS_5905 "3.5"" 640 Mt (ISO 15498)" + IDS_5906 "3.5"" 1.3 Gt (GigaMO)" + IDS_5907 "3.5"" 2.3 Gt (GigaMO 2)" + IDS_5908 "5.25"" 600 Mt" + IDS_5909 "5.25"" 650 Mt" + IDS_5910 "5.25"" 1 Gt" + IDS_5911 "5.25"" 1.3 Gt" IDS_6144 "Täydellinen RPM" IDS_6145 "1%% alle täydellisen RPM:n" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 66842e811..5fad5e366 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 Mo (ISO 10090)" + IDS_5903 "3.5"" 230 Mo (ISO 13963)" + IDS_5904 "3.5"" 540 Mo (ISO 15498)" + IDS_5905 "3.5"" 640 Mo (ISO 15498)" + IDS_5906 "3.5"" 1.3 Go (GigaMO)" + IDS_5907 "3.5"" 2.3 Go (GigaMO 2)" + IDS_5908 "5.25"" 600 Mo" + IDS_5909 "5.25"" 650 Mo" + IDS_5910 "5.25"" 1 Go" + IDS_5911 "5.25"" 1.3 Go" IDS_6144 "RPM précis" IDS_6145 "Précision RPM de moins 1%" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 5f079a2f5..ed41d24c3 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2,88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3,5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3,5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3,5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3,5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3,5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3,5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5,25"" 600Mb M.O." - IDS_5909 "5,25"" 650Mb M.O." - IDS_5910 "5,25"" 1Gb M.O." - IDS_5911 "5,25"" 1.3Gb M.O." + IDS_5902 "3,5"" 128 MB (ISO 10090)" + IDS_5903 "3,5"" 230 MB (ISO 13963)" + IDS_5904 "3,5"" 540 MB (ISO 15498)" + IDS_5905 "3,5"" 640 MB (ISO 15498)" + IDS_5906 "3,5"" 1.3 GB (GigaMO)" + IDS_5907 "3,5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5,25"" 600 MB" + IDS_5909 "5,25"" 650 MB" + IDS_5910 "5,25"" 1 GB" + IDS_5911 "5,25"" 1.3 GB" IDS_6144 "Savršeni broj okretaja u minuti" IDS_6145 "1%% ispod savršenog broja okretaja" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 262ee22ce..d28c9adc8 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -597,16 +597,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Tökéletes RPM" IDS_6145 "1%%-kal a tökéletes RPM alatt" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index fa1a23b0d..27081538f 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -594,16 +594,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfette" IDS_6145 "RPM 1%% sotto perfezione" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 054dc9566..e98ef2b45 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "規定の回転数" IDS_6145 "1%低い回転数" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index 68ac210e9..b9f68c3b4 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "완벽한 회전수" IDS_6145 "1% 낮은 회전수" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 5534aad6c..1baa3fd4d 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2,88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1,3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2,3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1,3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1,3 GB (GigaMO)" + IDS_5907 "3.5"" 2,3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1,3 GB" IDS_6144 "Idealne obroty" IDS_6145 "1%% poniżej idealnych obrotów" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 68b7e0582..670624cd9 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -596,16 +596,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfeita" IDS_6145 "1%% abaixo das RPM perfeita" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 373444107..d1a9b3bf5 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfeito" IDS_6145 "RPM 1%% abaixo do RPM perfeito" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index b47942377..10d7a3f5e 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 МБ" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Мб M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Мб M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Мб M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Мб M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Гб M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Гб M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Мб M.O." - IDS_5909 "5.25"" 650Мб M.O." - IDS_5910 "5.25"" 1Гб M.O." - IDS_5911 "5.25"" 1.3Гб M.O." + IDS_5902 "3.5"" 128 МБ (ISO 10090)" + IDS_5903 "3.5"" 230 МБ (ISO 13963)" + IDS_5904 "3.5"" 540 МБ (ISO 15498)" + IDS_5905 "3.5"" 640 МБ (ISO 15498)" + IDS_5906 "3.5"" 1.3 ГБ (GigaMO)" + IDS_5907 "3.5"" 2.3 ГБ (GigaMO 2)" + IDS_5908 "5.25"" 600 МБ" + IDS_5909 "5.25"" 650 МБ" + IDS_5910 "5.25"" 1 ГБ" + IDS_5911 "5.25"" 1.3 ГБ" IDS_6144 "Точный RPM" IDS_6145 "На 1% медленнее точного RPM" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 74e9ce896..87bba00ef 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Popolni obrati na minuto" IDS_6145 "1%% pod popolnimi obrati" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 7f5770a2f..11c3de6b5 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Mb M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Mb M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Mb M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Mb M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Gb M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Gb M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Mb M.O." - IDS_5909 "5.25"" 650Mb M.O." - IDS_5910 "5.25"" 1Gb M.O." - IDS_5911 "5.25"" 1.3Gb M.O." + IDS_5902 "3.5"" 128 MB (ISO 10090)" + IDS_5903 "3.5"" 230 MB (ISO 13963)" + IDS_5904 "3.5"" 540 MB (ISO 15498)" + IDS_5905 "3.5"" 640 MB (ISO 15498)" + IDS_5906 "3.5"" 1.3 GB (GigaMO)" + IDS_5907 "3.5"" 2.3 GB (GigaMO 2)" + IDS_5908 "5.25"" 600 MB" + IDS_5909 "5.25"" 650 MB" + IDS_5910 "5.25"" 1 GB" + IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Mükemmel RPM" IDS_6145 "mükemmel RPM değerinin 1%% altı" diff --git a/src/win/languages/uk-UA.rc b/src/win/languages/uk-UA.rc index fcc32a088..3279e016d 100644 --- a/src/win/languages/uk-UA.rc +++ b/src/win/languages/uk-UA.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 МБ" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5"" 128Мб M.O. (ISO 10090)" - IDS_5903 "3.5"" 230Мб M.O. (ISO 13963)" - IDS_5904 "3.5"" 540Мб M.O. (ISO 15498)" - IDS_5905 "3.5"" 640Мб M.O. (ISO 15498)" - IDS_5906 "3.5"" 1.3Гб M.O. (GigaMO)" - IDS_5907 "3.5"" 2.3Гб M.O. (GigaMO 2)" - IDS_5908 "5.25"" 600Мб M.O." - IDS_5909 "5.25"" 650Мб M.O." - IDS_5910 "5.25"" 1Гб M.O." - IDS_5911 "5.25"" 1.3Гб M.O." + IDS_5902 "3.5"" 128 МБ (ISO 10090)" + IDS_5903 "3.5"" 230 МБ (ISO 13963)" + IDS_5904 "3.5"" 540 МБ (ISO 15498)" + IDS_5905 "3.5"" 640 МБ (ISO 15498)" + IDS_5906 "3.5"" 1.3 ГБ (GigaMO)" + IDS_5907 "3.5"" 2.3 ГБ (GigaMO 2)" + IDS_5908 "5.25"" 600 МБ" + IDS_5909 "5.25"" 650 МБ" + IDS_5910 "5.25"" 1 ГБ" + IDS_5911 "5.25"" 1.3 ГБ" IDS_6144 "Точний RPM" IDS_6145 "На 1% повільніше точного RPM" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 5791bccd9..616b39d06 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -593,16 +593,16 @@ BEGIN IDS_5899 "2.88 MB" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" - IDS_5902 "3.5 英寸 128Mb 磁光盘 (ISO 10090)" - IDS_5903 "3.5 英寸 230Mb 磁光盘 (ISO 13963)" - IDS_5904 "3.5 英寸 540Mb 磁光盘 (ISO 15498)" - IDS_5905 "3.5 英寸 640Mb 磁光盘 (ISO 15498)" - IDS_5906 "3.5 英寸 1.3Gb 磁光盘 (GigaMO)" - IDS_5907 "3.5 英寸 2.3Gb 磁光盘 (GigaMO 2)" - IDS_5908 "5.25 英寸 600Mb 磁光盘" - IDS_5909 "5.25 英寸 650Mb 磁光盘" - IDS_5910 "5.25 英寸 1Gb 磁光盘" - IDS_5911 "5.25 英寸 1.3Gb 磁光盘" + IDS_5902 "3.5 英寸 128 MB (ISO 10090)" + IDS_5903 "3.5 英寸 230 MB (ISO 13963)" + IDS_5904 "3.5 英寸 540 MB (ISO 15498)" + IDS_5905 "3.5 英寸 640 MB (ISO 15498)" + IDS_5906 "3.5 英寸 1.3 GB (GigaMO)" + IDS_5907 "3.5 英寸 2.3 GB (GigaMO 2)" + IDS_5908 "5.25 英寸 600 MB" + IDS_5909 "5.25 英寸 650 MB" + IDS_5910 "5.25 英寸 1 GB" + IDS_5911 "5.25 英寸 1.3 GB" IDS_6144 "标准转速 (RPM)" IDS_6145 "低于标准转速的 1%%" From 2eae0644d03878dc308994d9b07755cbd723b24f Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 08:23:05 +0500 Subject: [PATCH 22/23] Consistently use octets in fr-FR translation --- src/qt/languages/fr-FR.po | 24 ++++++++++++------------ src/win/languages/fr-FR.rc | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 0b016252d..e0e5a8536 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -1040,10 +1040,10 @@ msgid "Differencing VHD (.vhd)" msgstr "VHD à différenciation (.vhd)" msgid "Large blocks (2 MB)" -msgstr "Blocs grands (2 MB)" +msgstr "Blocs grands (2 Mo)" msgid "Small blocks (512 KB)" -msgstr "Blocs petits (512 KB)" +msgstr "Blocs petits (512 Ko)" msgid "VHD files" msgstr "Fichiers VHD" @@ -1100,31 +1100,31 @@ msgid "CD-ROM %i (%s): %s" msgstr "CD-ROM %i (%s): %s" msgid "160 kB" -msgstr "160 kB" +msgstr "160 Ko" msgid "180 kB" -msgstr "180 kB" +msgstr "180 Ko" msgid "320 kB" -msgstr "320 kB" +msgstr "320 Ko" msgid "360 kB" -msgstr "360 kB" +msgstr "360 Ko" msgid "640 kB" -msgstr "640 kB" +msgstr "640 Ko" msgid "720 kB" -msgstr "720 kB" +msgstr "720 Ko" msgid "1.2 MB" -msgstr "1.2 MB" +msgstr "1.2 Mo" msgid "1.25 MB" -msgstr "1.25 MB" +msgstr "1.25 Mo" msgid "1.44 MB" -msgstr "1.44 MB" +msgstr "1.44 Mo" msgid "DMF (cluster 1024)" msgstr "DMF (cluster 1024)" @@ -1133,7 +1133,7 @@ msgid "DMF (cluster 2048)" msgstr "DMF (cluster 2048)" msgid "2.88 MB" -msgstr "2.88 MB" +msgstr "2.88 Mo" msgid "ZIP 100" msgstr "ZIP 100" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 5fad5e366..7f76c649c 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -546,8 +546,8 @@ BEGIN IDS_4125 "VHD à taille fixe (.vhd)" IDS_4126 "VHD à taille dynamique (.vhd)" IDS_4127 "VHD à différenciation (.vhd)" - IDS_4128 "Blocs grands (2 MB)" - IDS_4129 "Blocs petits (512 KB)" + IDS_4128 "Blocs grands (2 Mo)" + IDS_4129 "Blocs petits (512 Ko)" IDS_4130 "Fichiers VHD (*.VHD)\0*.VHD\0Tous les fichiers (*.*)\0*.*\0" IDS_4131 "Sélectionnez le VHD parent" IDS_4132 "Il est possible que l'image parente a été modifié après la création de l'image à différenciation.\n\nIl est même possible que les fichiers de l'mage ont été déplacés ou copiés ou il existe un bogue dans le programme que a créé ce disque.\n\nVoulez-vous réparer l'horodatage?" @@ -579,18 +579,18 @@ BEGIN IDS_5637 "ATAPI (%01i:%01i)" IDS_5638 "SCSI (%01i:%02i)" - IDS_5888 "160 kB" - IDS_5889 "180 kB" - IDS_5890 "320 kB" - IDS_5891 "360 kB" - IDS_5892 "640 kB" - IDS_5893 "720 kB" - IDS_5894 "1.2 MB" - IDS_5895 "1.25 MB" - IDS_5896 "1.44 MB" + IDS_5888 "160 Ko" + IDS_5889 "180 Ko" + IDS_5890 "320 Ko" + IDS_5891 "360 Ko" + IDS_5892 "640 Ko" + IDS_5893 "720 Ko" + IDS_5894 "1.2 Mo" + IDS_5895 "1.25 Mo" + IDS_5896 "1.44 Mo" IDS_5897 "DMF (cluster 1024)" IDS_5898 "DMF (cluster 2048)" - IDS_5899 "2.88 MB" + IDS_5899 "2.88 Mo" IDS_5900 "ZIP 100" IDS_5901 "ZIP 250" IDS_5902 "3.5"" 128 Mo (ISO 10090)" From b122f96787c8ff3de240ab600fc5928e431d29c4 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 08:27:01 +0500 Subject: [PATCH 23/23] Remove an unneeded double percent sign --- src/qt/languages/cs-CZ.po | 12 ++++++------ src/qt/languages/de-DE.po | 12 ++++++------ src/qt/languages/en-GB.po | 12 ++++++------ src/qt/languages/en-US.po | 12 ++++++------ src/qt/languages/es-ES.po | 12 ++++++------ src/qt/languages/fi-FI.po | 12 ++++++------ src/qt/languages/fr-FR.po | 6 +++--- src/qt/languages/hr-HR.po | 12 ++++++------ src/qt/languages/hu-HU.po | 12 ++++++------ src/qt/languages/it-IT.po | 12 ++++++------ src/qt/languages/ja-JP.po | 6 +++--- src/qt/languages/ko-KR.po | 6 +++--- src/qt/languages/pl-PL.po | 12 ++++++------ src/qt/languages/pt-BR.po | 12 ++++++------ src/qt/languages/pt-PT.po | 12 ++++++------ src/qt/languages/ru-RU.po | 6 +++--- src/qt/languages/sl-SI.po | 12 ++++++------ src/qt/languages/tr-TR.po | 12 ++++++------ src/qt/languages/uk-UA.po | 6 +++--- src/qt/languages/zh-CN.po | 12 ++++++------ src/qt/qt_newfloppydialog.cpp | 8 ++++---- src/win/languages/cs-CZ.rc | 6 +++--- src/win/languages/de-DE.rc | 6 +++--- src/win/languages/en-GB.rc | 6 +++--- src/win/languages/en-US.rc | 6 +++--- src/win/languages/es-ES.rc | 6 +++--- src/win/languages/fi-FI.rc | 6 +++--- src/win/languages/hr-HR.rc | 6 +++--- src/win/languages/hu-HU.rc | 6 +++--- src/win/languages/it-IT.rc | 6 +++--- src/win/languages/pl-PL.rc | 6 +++--- src/win/languages/pt-BR.rc | 6 +++--- src/win/languages/pt-PT.rc | 6 +++--- src/win/languages/sl-SI.rc | 6 +++--- src/win/languages/tr-TR.rc | 6 +++--- src/win/languages/zh-CN.rc | 6 +++--- 36 files changed, 154 insertions(+), 154 deletions(-) diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 050a29224..6f7ecc69e 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Dokonalé otáčky za minutu" -msgid "1%% below perfect RPM" -msgstr "1%% pod dokonalými ot./m" +msgid "1% below perfect RPM" +msgstr "1% pod dokonalými ot./m" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% pod dokonalými ot./m" +msgid "1.5% below perfect RPM" +msgstr "1.5% pod dokonalými ot./m" -msgid "2%% below perfect RPM" -msgstr "2%% pod dokonalými ot./m" +msgid "2% below perfect RPM" +msgstr "2% pod dokonalými ot./m" msgid "(System Default)" msgstr "(Výchozí nastavení systému)" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index dad99d911..2951c7b85 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -1171,14 +1171,14 @@ msgstr "5,25-Zoll 1,3 GB" msgid "Perfect RPM" msgstr "Perfekte Drehzahl" -msgid "1%% below perfect RPM" -msgstr "1%% unterhalb der perfekten Drehzahl" +msgid "1% below perfect RPM" +msgstr "1% unterhalb der perfekten Drehzahl" -msgid "1.5%% below perfect RPM" -msgstr "1,5%% unterhalb der perfekten Drehzahl" +msgid "1.5% below perfect RPM" +msgstr "1,5% unterhalb der perfekten Drehzahl" -msgid "2%% below perfect RPM" -msgstr "2%% unterhalb der perfekten Drehzahl" +msgid "2% below perfect RPM" +msgstr "2% unterhalb der perfekten Drehzahl" msgid "(System Default)" msgstr "(Systemstandard)" diff --git a/src/qt/languages/en-GB.po b/src/qt/languages/en-GB.po index f38d8ad8a..90820a569 100644 --- a/src/qt/languages/en-GB.po +++ b/src/qt/languages/en-GB.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Perfect RPM" -msgid "1%% below perfect RPM" -msgstr "1%% below perfect RPM" +msgid "1% below perfect RPM" +msgstr "1% below perfect RPM" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" +msgstr "1.5% below perfect RPM" -msgid "2%% below perfect RPM" -msgstr "2%% below perfect RPM" +msgid "2% below perfect RPM" +msgstr "2% below perfect RPM" msgid "(System Default)" msgstr "(System Default)" diff --git a/src/qt/languages/en-US.po b/src/qt/languages/en-US.po index ae3fb5234..b11e1cdea 100644 --- a/src/qt/languages/en-US.po +++ b/src/qt/languages/en-US.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Perfect RPM" -msgid "1%% below perfect RPM" -msgstr "1%% below perfect RPM" +msgid "1% below perfect RPM" +msgstr "1% below perfect RPM" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" +msgstr "1.5% below perfect RPM" -msgid "2%% below perfect RPM" -msgstr "2%% below perfect RPM" +msgid "2% below perfect RPM" +msgstr "2% below perfect RPM" msgid "(System Default)" msgstr "(System Default)" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index e304fd1db..c7b306e1c 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfectas" -msgid "1%% below perfect RPM" -msgstr "1%% por debajo de RPM perfectas" +msgid "1% below perfect RPM" +msgstr "1% por debajo de RPM perfectas" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% por debajo de RPM perfectas" +msgid "1.5% below perfect RPM" +msgstr "1.5% por debajo de RPM perfectas" -msgid "2%% below perfect RPM" -msgstr "2%% por debajo de RPM perfectas" +msgid "2% below perfect RPM" +msgstr "2% por debajo de RPM perfectas" msgid "(System Default)" msgstr "(Por defecto del sistema)" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 980bb493e..c243c83cb 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 Gt" msgid "Perfect RPM" msgstr "Täydellinen RPM" -msgid "1%% below perfect RPM" -msgstr "1%% alle täydellisen RPM:n" +msgid "1% below perfect RPM" +msgstr "1% alle täydellisen RPM:n" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% alle täydellisen RPM:n" +msgid "1.5% below perfect RPM" +msgstr "1.5% alle täydellisen RPM:n" -msgid "2%% below perfect RPM" -msgstr "2%% alle täydellisen RPM:n" +msgid "2% below perfect RPM" +msgstr "2% alle täydellisen RPM:n" msgid "(System Default)" msgstr "(Järjestelmän oletus)" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index e0e5a8536..7fa029045 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -1171,13 +1171,13 @@ msgstr "5.25\" 1.3 Go" msgid "Perfect RPM" msgstr "RPM précis" -msgid "1%% below perfect RPM" +msgid "1% below perfect RPM" msgstr "Précision RPM de moins 1%" -msgid "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" msgstr "Précision RPM de moins 1.5%" -msgid "2%% below perfect RPM" +msgid "2% below perfect RPM" msgstr "Précision RPM de moins 2%" msgid "(System Default)" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index 3c95cbe41..1d3ab11a2 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -1171,14 +1171,14 @@ msgstr "5,25\" 1.3 GB" msgid "Perfect RPM" msgstr "Savršeni broj okretaja u minuti" -msgid "1%% below perfect RPM" -msgstr "1%% ispod savršenog broja okretaja" +msgid "1% below perfect RPM" +msgstr "1% ispod savršenog broja okretaja" -msgid "1.5%% below perfect RPM" -msgstr "1,5%% ispod savršenog broja okretaja" +msgid "1.5% below perfect RPM" +msgstr "1,5% ispod savršenog broja okretaja" -msgid "2%% below perfect RPM" -msgstr "2%% ispod savršenog broja okretaja" +msgid "2% below perfect RPM" +msgstr "2% ispod savršenog broja okretaja" msgid "(System Default)" msgstr "(Zadana postavka operativnog sustava)" diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index e26b6b3e0..716ad22fc 100644 --- a/src/qt/languages/hu-HU.po +++ b/src/qt/languages/hu-HU.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Tökéletes RPM" -msgid "1%% below perfect RPM" -msgstr "1%%-kal a tökéletes RPM alatt" +msgid "1% below perfect RPM" +msgstr "1%-kal a tökéletes RPM alatt" -msgid "1.5%% below perfect RPM" -msgstr "1.5%%-kal a tökéletes RPM alatt" +msgid "1.5% below perfect RPM" +msgstr "1.5%-kal a tökéletes RPM alatt" -msgid "2%% below perfect RPM" -msgstr "2%%-kal a tökéletes RPM alatt" +msgid "2% below perfect RPM" +msgstr "2%-kal a tökéletes RPM alatt" msgid "(System Default)" msgstr "(A rendszer nyelve)" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index ca42c4f25..ee5e2a01a 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfette" -msgid "1%% below perfect RPM" -msgstr "RPM 1%% sotto perfezione" +msgid "1% below perfect RPM" +msgstr "RPM 1% sotto perfezione" -msgid "1.5%% below perfect RPM" -msgstr "RPM 1.5%% sotto perfezione" +msgid "1.5% below perfect RPM" +msgstr "RPM 1.5% sotto perfezione" -msgid "2%% below perfect RPM" -msgstr "RPM 2%% sotto perfezione" +msgid "2% below perfect RPM" +msgstr "RPM 2% sotto perfezione" msgid "(System Default)" msgstr "(Predefinito del sistema)" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index 5a0180bfa..7a66603b4 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -1171,13 +1171,13 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "規定の回転数" -msgid "1%% below perfect RPM" +msgid "1% below perfect RPM" msgstr "1%低い回転数" -msgid "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" msgstr "1.5%低い回転数" -msgid "2%% below perfect RPM" +msgid "2% below perfect RPM" msgstr "2%低い回転数" msgid "(System Default)" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 434b1d5db..bd5cd3e37 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -1171,13 +1171,13 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "완벽한 회전수" -msgid "1%% below perfect RPM" +msgid "1% below perfect RPM" msgstr "1% 낮은 회전수" -msgid "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" msgstr "1.5% 낮은 회전수" -msgid "2%% below perfect RPM" +msgid "2% below perfect RPM" msgstr "2% 낮은 회전수" msgid "(System Default)" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 76c89e316..877c0acc9 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1,3 GB" msgid "Perfect RPM" msgstr "Idealne obroty" -msgid "1%% below perfect RPM" -msgstr "1%% poniżej idealnych obrotów" +msgid "1% below perfect RPM" +msgstr "1% poniżej idealnych obrotów" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% poniżej idealnych obrotów" +msgid "1.5% below perfect RPM" +msgstr "1.5% poniżej idealnych obrotów" -msgid "2%% below perfect RPM" -msgstr "2%% poniżej idealnych obrotów" +msgid "2% below perfect RPM" +msgstr "2% poniżej idealnych obrotów" msgid "(System Default)" msgstr "(Domyślne ustawienie systemowe)" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index e871588fa..7d1eecb09 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfeita" -msgid "1%% below perfect RPM" -msgstr "1%% abaixo das RPM perfeita" +msgid "1% below perfect RPM" +msgstr "1% abaixo das RPM perfeita" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% abaixo das RPM perfeita" +msgid "1.5% below perfect RPM" +msgstr "1.5% abaixo das RPM perfeita" -msgid "2%% below perfect RPM" -msgstr "2%% abaixo das RPM perfeita" +msgid "2% below perfect RPM" +msgstr "2% abaixo das RPM perfeita" msgid "(System Default)" msgstr "(Padrão do sistema)" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index e6c9f9615..301b52566 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "RPM perfeito" -msgid "1%% below perfect RPM" -msgstr "RPM 1%% abaixo do RPM perfeito" +msgid "1% below perfect RPM" +msgstr "RPM 1% abaixo do RPM perfeito" -msgid "1.5%% below perfect RPM" -msgstr "RPM 1.5%% abaixo do RPM perfeito" +msgid "1.5% below perfect RPM" +msgstr "RPM 1.5% abaixo do RPM perfeito" -msgid "2%% below perfect RPM" -msgstr "RPM 2%% abaixo do RPM perfeito" +msgid "2% below perfect RPM" +msgstr "RPM 2% abaixo do RPM perfeito" msgid "(System Default)" msgstr "(Padrão do sistema)" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index 347bbd05d..a33cc81dd 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -1171,13 +1171,13 @@ msgstr "5.25\" 1.3 ГБ" msgid "Perfect RPM" msgstr "Точный RPM" -msgid "1%% below perfect RPM" +msgid "1% below perfect RPM" msgstr "На 1% медленнее точного RPM" -msgid "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" msgstr "На 1.5% медленнее точного RPM" -msgid "2%% below perfect RPM" +msgid "2% below perfect RPM" msgstr "На 2% медленнее точного RPM" msgid "(System Default)" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 8cba7f312..5a396c855 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Popolni obrati na minuto" -msgid "1%% below perfect RPM" -msgstr "1%% pod popolnimi obrati" +msgid "1% below perfect RPM" +msgstr "1% pod popolnimi obrati" -msgid "1.5%% below perfect RPM" -msgstr "1.5%% pod popolnimi obrati" +msgid "1.5% below perfect RPM" +msgstr "1.5% pod popolnimi obrati" -msgid "2%% below perfect RPM" -msgstr "2%% pod popolnimi obrati" +msgid "2% below perfect RPM" +msgstr "2% pod popolnimi obrati" msgid "(System Default)" msgstr "(Sistemsko privzeto)" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index 99d6cead3..2a12b3d85 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -1171,14 +1171,14 @@ msgstr "5.25\" 1.3 GB" msgid "Perfect RPM" msgstr "Mükemmel RPM" -msgid "1%% below perfect RPM" -msgstr "mükemmel RPM değerinin 1%% altı" +msgid "1% below perfect RPM" +msgstr "mükemmel RPM değerinin 1% altı" -msgid "1.5%% below perfect RPM" -msgstr "mükemmel RPM değerinin 1.5%% altı" +msgid "1.5% below perfect RPM" +msgstr "mükemmel RPM değerinin 1.5% altı" -msgid "2%% below perfect RPM" -msgstr "mükemmel RPM değerinin 2%% altı" +msgid "2% below perfect RPM" +msgstr "mükemmel RPM değerinin 2% altı" msgid "(System Default)" msgstr "(Sistem Varsayılanı)" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index fce5f3874..76382a9c7 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -1171,13 +1171,13 @@ msgstr "5.25\" 1.3 ГБ" msgid "Perfect RPM" msgstr "Точний RPM" -msgid "1%% below perfect RPM" +msgid "1% below perfect RPM" msgstr "На 1% повільніше точного RPM" -msgid "1.5%% below perfect RPM" +msgid "1.5% below perfect RPM" msgstr "На 1.5% повільніше точного RPM" -msgid "2%% below perfect RPM" +msgid "2% below perfect RPM" msgstr "На 2% повільніше точного RPM" msgid "(System Default)" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 22261e24c..165878dec 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -1171,14 +1171,14 @@ msgstr "5.25 英寸 1.3 GB" msgid "Perfect RPM" msgstr "标准转速 (RPM)" -msgid "1%% below perfect RPM" -msgstr "低于标准转速的 1%%" +msgid "1% below perfect RPM" +msgstr "低于标准转速的 1%" -msgid "1.5%% below perfect RPM" -msgstr "低于标准转速的 1.5%%" +msgid "1.5% below perfect RPM" +msgstr "低于标准转速的 1.5%" -msgid "2%% below perfect RPM" -msgstr "低于标准转速的 2%%" +msgid "2% below perfect RPM" +msgstr "低于标准转速的 2%" msgid "(System Default)" msgstr "(系统默认)" diff --git a/src/qt/qt_newfloppydialog.cpp b/src/qt/qt_newfloppydialog.cpp index 26afa0f7c..76fbb8aca 100644 --- a/src/qt/qt_newfloppydialog.cpp +++ b/src/qt/qt_newfloppydialog.cpp @@ -71,9 +71,9 @@ static const disk_size_t disk_sizes[14] = { { 0, 1, 2, 1, 0, 40, 8, 2, 0xfe, static const QStringList rpmModes = { "Perfect RPM", - "1%% below perfect RPM", - "1.5%% below perfect RPM", - "2%% below perfect RPM", + "1% below perfect RPM", + "1.5% below perfect RPM", + "2% below perfect RPM", }; static const QStringList floppyTypes = { @@ -148,7 +148,7 @@ NewFloppyDialog::NewFloppyDialog(MediaType type, QWidget *parent) : model = ui->comboBoxRpm->model(); for (int i = 0; i < rpmModes.size(); ++i) { - Models::AddEntry(model, tr(rpmModes[i].toUtf8().data()).replace("%%", "%"), i); + Models::AddEntry(model, tr(rpmModes[i].toUtf8().data()), i); } connect(ui->fileField, &FileField::fileSelected, this, [this](const QString& filename) { diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index f7735c3e7..530a706c9 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Dokonalé otáčky za minutu" - IDS_6145 "1%% pod dokonalými ot./m" - IDS_6146 "1.5%% pod dokonalými ot./m" - IDS_6147 "2%% pod dokonalými ot./m" + IDS_6145 "1% pod dokonalými ot./m" + IDS_6146 "1.5% pod dokonalými ot./m" + IDS_6147 "2% pod dokonalými ot./m" IDS_7168 "(Výchozí nastavení systému)" END diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index ca61b0d02..f348d5c97 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5,25-Zoll 1,3 GB" IDS_6144 "Perfekte Drehzahl" - IDS_6145 "1%% unterhalb der perfekten Drehzahl" - IDS_6146 "1,5%% unterhalb der perfekten Drehzahl" - IDS_6147 "2%% unterhalb der perfekten Drehzahl" + IDS_6145 "1% unterhalb der perfekten Drehzahl" + IDS_6146 "1,5% unterhalb der perfekten Drehzahl" + IDS_6147 "2% unterhalb der perfekten Drehzahl" IDS_7168 "(Systemstandard)" END diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 268ff2bf6..ae2def0bd 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Perfect RPM" - IDS_6145 "1%% below perfect RPM" - IDS_6146 "1.5%% below perfect RPM" - IDS_6147 "2%% below perfect RPM" + IDS_6145 "1% below perfect RPM" + IDS_6146 "1.5% below perfect RPM" + IDS_6147 "2% below perfect RPM" IDS_7168 "(System Default)" END diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index bed5e341e..12afe10ce 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Perfect RPM" - IDS_6145 "1%% below perfect RPM" - IDS_6146 "1.5%% below perfect RPM" - IDS_6147 "2%% below perfect RPM" + IDS_6145 "1% below perfect RPM" + IDS_6146 "1.5% below perfect RPM" + IDS_6147 "2% below perfect RPM" IDS_7168 "(System Default)" END diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 85cfaa6b1..350017861 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfectas" - IDS_6145 "1%% por debajo de RPM perfectas" - IDS_6146 "1.5%% por debajo de RPM perfectas" - IDS_6147 "2%% por debajo de RPM perfectas" + IDS_6145 "1% por debajo de RPM perfectas" + IDS_6146 "1.5% por debajo de RPM perfectas" + IDS_6147 "2% por debajo de RPM perfectas" IDS_7168 "(Por defecto del sistema)" END diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 5be6a3541..695c91353 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 Gt" IDS_6144 "Täydellinen RPM" - IDS_6145 "1%% alle täydellisen RPM:n" - IDS_6146 "1.5%% alle täydellisen RPM:n" - IDS_6147 "2%% alle täydellisen RPM:n" + IDS_6145 "1% alle täydellisen RPM:n" + IDS_6146 "1.5% alle täydellisen RPM:n" + IDS_6147 "2% alle täydellisen RPM:n" IDS_7168 "(Järjestelmän oletus)" END diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index ed41d24c3..d41441721 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5,25"" 1.3 GB" IDS_6144 "Savršeni broj okretaja u minuti" - IDS_6145 "1%% ispod savršenog broja okretaja" - IDS_6146 "1,5%% ispod savršenog broja okretaja" - IDS_6147 "2%% ispod savršenog broja okretaja" + IDS_6145 "1% ispod savršenog broja okretaja" + IDS_6146 "1,5% ispod savršenog broja okretaja" + IDS_6147 "2% ispod savršenog broja okretaja" IDS_7168 "(Zadana postavka operativnog sustava)" END diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index d28c9adc8..d0cccad1a 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -609,9 +609,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Tökéletes RPM" - IDS_6145 "1%%-kal a tökéletes RPM alatt" - IDS_6146 "1.5%%-kal a tökéletes RPM alatt" - IDS_6147 "2%%-kal a tökéletes RPM alatt" + IDS_6145 "1%-kal a tökéletes RPM alatt" + IDS_6146 "1.5%-kal a tökéletes RPM alatt" + IDS_6147 "2%-kal a tökéletes RPM alatt" IDS_7168 "(A rendszer nyelve)" END diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 27081538f..9e31ffabd 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -606,9 +606,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfette" - IDS_6145 "RPM 1%% sotto perfezione" - IDS_6146 "RPM 1.5%% sotto perfezione" - IDS_6147 "RPM 2%% sotto perfezione" + IDS_6145 "RPM 1% sotto perfezione" + IDS_6146 "RPM 1.5% sotto perfezione" + IDS_6147 "RPM 2% sotto perfezione" IDS_7168 "(Predefinito del sistema)" END diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 1baa3fd4d..45869d68b 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1,3 GB" IDS_6144 "Idealne obroty" - IDS_6145 "1%% poniżej idealnych obrotów" - IDS_6146 "1.5%% poniżej idealnych obrotów" - IDS_6147 "2%% poniżej idealnych obrotów" + IDS_6145 "1% poniżej idealnych obrotów" + IDS_6146 "1.5% poniżej idealnych obrotów" + IDS_6147 "2% poniżej idealnych obrotów" IDS_7168 "(Domyślne ustawienie systemowe)" END diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 670624cd9..6f74e40d5 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -608,9 +608,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfeita" - IDS_6145 "1%% abaixo das RPM perfeita" - IDS_6146 "1.5%% abaixo das RPM perfeita" - IDS_6147 "2%% abaixo das RPM perfeita" + IDS_6145 "1% abaixo das RPM perfeita" + IDS_6146 "1.5% abaixo das RPM perfeita" + IDS_6147 "2% abaixo das RPM perfeita" IDS_7168 "(Padrão do sistema)" END diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index d1a9b3bf5..009e3f0df 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "RPM perfeito" - IDS_6145 "RPM 1%% abaixo do RPM perfeito" - IDS_6146 "RPM 1.5%% abaixo do RPM perfeito" - IDS_6147 "RPM 2%% abaixo do RPM perfeito" + IDS_6145 "RPM 1% abaixo do RPM perfeito" + IDS_6146 "RPM 1.5% abaixo do RPM perfeito" + IDS_6147 "RPM 2% abaixo do RPM perfeito" IDS_7168 "(Padrão do sistema)" END diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 87bba00ef..008b1a2c6 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Popolni obrati na minuto" - IDS_6145 "1%% pod popolnimi obrati" - IDS_6146 "1.5%% pod popolnimi obrati" - IDS_6147 "2%% pod popolnimi obrati" + IDS_6145 "1% pod popolnimi obrati" + IDS_6146 "1.5% pod popolnimi obrati" + IDS_6147 "2% pod popolnimi obrati" IDS_7168 "(Sistemsko privzeto)" END diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 11c3de6b5..ac0ab6400 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25"" 1.3 GB" IDS_6144 "Mükemmel RPM" - IDS_6145 "mükemmel RPM değerinin 1%% altı" - IDS_6146 "mükemmel RPM değerinin 1.5%% altı" - IDS_6147 "mükemmel RPM değerinin 2%% altı" + IDS_6145 "mükemmel RPM değerinin 1% altı" + IDS_6146 "mükemmel RPM değerinin 1.5% altı" + IDS_6147 "mükemmel RPM değerinin 2% altı" IDS_7168 "(Sistem Varsayılanı)" END diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 616b39d06..a1b699e41 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -605,9 +605,9 @@ BEGIN IDS_5911 "5.25 英寸 1.3 GB" IDS_6144 "标准转速 (RPM)" - IDS_6145 "低于标准转速的 1%%" - IDS_6146 "低于标准转速的 1.5%%" - IDS_6147 "低于标准转速的 2%%" + IDS_6145 "低于标准转速的 1%" + IDS_6146 "低于标准转速的 1.5%" + IDS_6147 "低于标准转速的 2%" IDS_7168 "(系统默认)" END