From 05e2ce8b07e8332af887f608831c36d4f7bde664 Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Sat, 29 May 2021 15:26:13 +0300 Subject: Keys: Redundant split menu language strings --- po/en.po | 25 ++----------------------- res/lang/de.bin | Bin 21080 -> 20699 bytes res/lang/en.bin | Bin 19785 -> 19404 bytes res/lang/es.bin | Bin 22127 -> 21746 bytes res/lang/fi.bin | Bin 21768 -> 21892 bytes res/lang/fr.bin | Bin 22692 -> 22311 bytes res/lang/ia.bin | Bin 21990 -> 21609 bytes res/lang/ie.bin | Bin 21158 -> 21153 bytes res/lang/pl.bin | Bin 22796 -> 22415 bytes res/lang/ru.bin | Bin 32877 -> 32496 bytes res/lang/sr.bin | Bin 31452 -> 31969 bytes res/lang/tok.bin | Bin 20195 -> 19814 bytes res/lang/zh_Hans.bin | Bin 18949 -> 18568 bytes res/lang/zh_Hant.bin | Bin 19134 -> 18753 bytes src/ui/keys.c | 16 ++++++++-------- 15 files changed, 10 insertions(+), 31 deletions(-) diff --git a/po/en.po b/po/en.po index 9744f761..8fe6b96d 100644 --- a/po/en.po +++ b/po/en.po @@ -1393,29 +1393,8 @@ msgstr "Set view split mode" msgid "keys.split.next" msgstr "Switch focus to next split" -msgid "keys.split.menu.merge" -msgstr "Split view menu: Merge tabs" - -msgid "keys.split.menu.swap" -msgstr "Split view menu: Swap sides" - -msgid "keys.split.menu.horiz" -msgstr "Split view menu: Horizontal" - -msgid "keys.split.menu.horiz12" -msgstr "Split view menu: Horizontal 1:2" - -msgid "keys.split.menu.horiz21" -msgstr "Split view menu: Horizontal 2:1" - -msgid "keys.split.menu.vert" -msgstr "Split view menu: Vertical" - -msgid "keys.split.menu.vert12" -msgstr "Split view menu: Vertical 1:2" - -msgid "keys.split.menu.vert21" -msgstr "Split view menu: Vertical 2:1" +msgid "keys.split.item" +msgstr "Split view menu:" msgid "keys.hoverurl" msgstr "Toggle show URL on hover" diff --git a/res/lang/de.bin b/res/lang/de.bin index a5f3c427..b89c8b0f 100644 Binary files a/res/lang/de.bin and b/res/lang/de.bin differ diff --git a/res/lang/en.bin b/res/lang/en.bin index 3fe8fc26..0ac42d88 100644 Binary files a/res/lang/en.bin and b/res/lang/en.bin differ diff --git a/res/lang/es.bin b/res/lang/es.bin index 8a8c314f..01d86e3f 100644 Binary files a/res/lang/es.bin and b/res/lang/es.bin differ diff --git a/res/lang/fi.bin b/res/lang/fi.bin index 361f3fce..7034468b 100644 Binary files a/res/lang/fi.bin and b/res/lang/fi.bin differ diff --git a/res/lang/fr.bin b/res/lang/fr.bin index d6875a05..0b78f3b7 100644 Binary files a/res/lang/fr.bin and b/res/lang/fr.bin differ diff --git a/res/lang/ia.bin b/res/lang/ia.bin index 1ebd2fea..e6590afc 100644 Binary files a/res/lang/ia.bin and b/res/lang/ia.bin differ diff --git a/res/lang/ie.bin b/res/lang/ie.bin index 4738fd3e..dcf6a70d 100644 Binary files a/res/lang/ie.bin and b/res/lang/ie.bin differ diff --git a/res/lang/pl.bin b/res/lang/pl.bin index 877ffaf7..9f42024c 100644 Binary files a/res/lang/pl.bin and b/res/lang/pl.bin differ diff --git a/res/lang/ru.bin b/res/lang/ru.bin index 8301f8d4..3cacac36 100644 Binary files a/res/lang/ru.bin and b/res/lang/ru.bin differ diff --git a/res/lang/sr.bin b/res/lang/sr.bin index 75fe0b99..af0acbf9 100644 Binary files a/res/lang/sr.bin and b/res/lang/sr.bin differ diff --git a/res/lang/tok.bin b/res/lang/tok.bin index d5419504..8f10e051 100644 Binary files a/res/lang/tok.bin and b/res/lang/tok.bin differ diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin index 66c62937..b155036d 100644 Binary files a/res/lang/zh_Hans.bin and b/res/lang/zh_Hans.bin differ diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin index 57e310e2..57ce2d83 100644 Binary files a/res/lang/zh_Hant.bin and b/res/lang/zh_Hant.bin differ diff --git a/src/ui/keys.c b/src/ui/keys.c index 17cc0e72..b15fe04b 100644 --- a/src/ui/keys.c +++ b/src/ui/keys.c @@ -228,14 +228,14 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] = { 81, { "${keys.tab.next}", nextTab_KeyShortcut, "tabs.next" }, 0 }, { 90, { "${keys.split.menu}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" }, 0 }, { 91, { "${keys.split.next}", SDLK_TAB, KMOD_CTRL, "keyroot.next", }, 0 }, - { 92, { "${keys.split.menu.merge}", '1', 0, "ui.split arg:0", }, noDirectTrigger_BindFlag }, - { 93, { "${keys.split.menu.swap}", SDLK_x, 0, "ui.split swap:1", }, noDirectTrigger_BindFlag }, - { 94, { "${keys.split.menu.horiz}", '3', 0, "ui.split arg:3 axis:0", }, noDirectTrigger_BindFlag }, - { 95, { "${keys.split.menu.horiz12}", SDLK_d, 0, "ui.split arg:1 axis:0", }, noDirectTrigger_BindFlag }, - { 96, { "${keys.split.menu.horiz21}", SDLK_e, 0, "ui.split arg:2 axis:0", }, noDirectTrigger_BindFlag }, - { 97, { "${keys.split.menu.vert}", '2', 0, "ui.split arg:3 axis:1", }, noDirectTrigger_BindFlag }, - { 98, { "${keys.split.menu.vert12}", SDLK_f, 0, "ui.split arg:1 axis:1", }, noDirectTrigger_BindFlag }, - { 99, { "${keys.split.menu.vert21}", SDLK_r, 0, "ui.split arg:2 axis:1", }, noDirectTrigger_BindFlag }, + { 92, { "${keys.split.item} ${menu.split.merge}", '1', 0, "ui.split arg:0", }, noDirectTrigger_BindFlag }, + { 93, { "${keys.split.item} ${menu.split.swap}", SDLK_x, 0, "ui.split swap:1", }, noDirectTrigger_BindFlag }, + { 94, { "${keys.split.item} ${menu.split.horizontal}", '3', 0, "ui.split arg:3 axis:0", }, noDirectTrigger_BindFlag }, + { 95, { "${keys.split.item} ${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0", }, noDirectTrigger_BindFlag }, + { 96, { "${keys.split.item} ${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0", }, noDirectTrigger_BindFlag }, + { 97, { "${keys.split.item} ${menu.split.vertical}", '2', 0, "ui.split arg:3 axis:1", }, noDirectTrigger_BindFlag }, + { 98, { "${keys.split.item} ${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1", }, noDirectTrigger_BindFlag }, + { 99, { "${keys.split.item} ${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1", }, noDirectTrigger_BindFlag }, { 100,{ "${keys.hoverurl}", '/', KMOD_PRIMARY, "prefs.hoverlink.toggle" }, 0 }, { 110,{ "${menu.save.downloads}", SDLK_s, KMOD_PRIMARY, "document.save" }, 0 }, /* The following cannot currently be changed (built-in duplicates). */ -- cgit v1.2.3