From 05e2ce8b07e8332af887f608831c36d4f7bde664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sat, 29 May 2021 15:26:13 +0300 Subject: [PATCH 1/1] 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 a5f3c4279078fb01263f502d020038b0a16bb0d6..b89c8b0fa220780c89f403e8d4f9981a7d40155f 100644 GIT binary patch delta 40 wcmcbygz@%5#torHqM0SBxeUPtIhiF2Wtpkv3c0CyrB;(YjSM!6n>fk=07SSBhX4Qo delta 424 zcmcb;knzS6#torHlgo@$>T^@`O7$}Gi!!Sif(vpoOBBj7Q_B@VqE-qXAmRMHlEfT_ z?9|F)y<(68J%kQJBYb)k46Tf?>oYQh>#N6NnSzm(A%@1>)S~oMxHh;hUy!guNn%nl zhK}O$!~#qW!9Y=k;>?s(h=zJ(PnD$>m0;=!1BzxQV+jM0a%@2W(||PqK$?*JFADbw NTo=&yoBND>(i}B2K#tl^lqM0SBxeUPtIhiF2Wtpkv3c0CyrB;*k3=B5g81YI207D55hX4Qo delta 424 zcmX>zo$=%>#tl^llV=;K)aRz=mFi{W7iCs41Q+CFmMD~Erj{#!M6DD&K*ITXC5br< z*{PMqdc`0GdI%kcM)>q77+M)&*Jor1*H@3lG6f?mLkx|%sYU6jaBXm1z93?MaO06azF}2&g!2G-%0A;`s=>Px# delta 424 zcmeyglJWf-#tj!tCx0|Gs?SZ$E7i-$FUqW92rkIUEKw-SOf6RciCQUmfQ0k&N)mGz zvQsOI^@>3X^bk4>jqvGFFtjqluFuF2uCE@8WeP@Ch8P-iQ;X75;o9K3d_lqrC5cJJ z7&?l}6ALgk1Or7CiZfGEAsXtDJyn)kRD!7^3@DnJj3o>}%CQ9jOas;c0BJ(QVB$Xf!_nCXyx!L9B?H-GS zSXkH(q_PMyHd;hju#gDC`~j)O(%!$pIk7Xjn_?J-@At#^J8#~8ti1VD`Fv5mxu40S z@_Y6D%=?2h@~jWl=kuGpF_1qQ-0hkb{&U zazf1{rL$$b@nL>mFpxO#YopuU*xfb1!=Kdy!t(O|^Qk&9_JjRY5|4aC(MOfF&AsM> zMhDQx70TJT@C}skbn+eA{s1wUSIw1)n)Bw`$pntrYHtQH7CO|U6yYd<-v++v_0FOf zk@k-ya%Uw;>_y1`LG%#PptC-v2K6EkX_iO=v(s7}QztDn7v{LNJW+GrtgriF^Va5= z{C{!fuh!a}xqP@(6GtHY@IWwOlxY908joJzngXVTOWXN2eW#n{5aY{4F;gk`-re{E Dpw$RO delta 562 zcmaJ;O)o=H5N%PUQZ%87kLs}Z)uhPVNlQdM%ESKF8{Bxk_qq3K5eo|ovAsL75QzKAir#0O~{NPRbvny=%pqfm5%cy)T_X6iQ^ z-vr$|+28Z$xL|EEoya((YIfu1V>RY+;z}UQg(V*u%u)}7^TKg+Oi|8ckSRX3v^fWr PGWTH995Q%YxoG$V<3`6q diff --git a/res/lang/fr.bin b/res/lang/fr.bin index d6875a058ba397ece3af82f70c96eba533ebf34c..0b78f3b771ac7e236dd18401d9e884bec44bda57 100644 GIT binary patch delta 40 wcmZ3ok#YGt#tjq9MKeoMa~XmQaxzO4$}&^S6>?MaO06chm^*AvvUHLM07SPB8vp3X^bk4>jqvGFFtjqluFuF2uCE@8WeP@Ch8P-iQ;X75;o9K3d_lqrC5cJJ z7&?l}6ALgk1Or7CiZfGEAsXtDJyn)kRD!7^3@DnJj3o>}%CQ9jOas;c0BJ(?MaO06cZF)`R&WtJlk09_3b3;+NC delta 424 zcmaF4g7MjE#tl16Cf_tssn1Q#E7i-$FUqW92rkIUEKw-SOf6RciCQUmfQ0k&N)mGz zvQsOI^@>3X^bk4>jqvGFFtjqluFuF2uCE@8WeP@Ch8P-iQ;X75;o9K3d_lqrC5cJJ z7&?l}6ALgk1Or7CiZfGEAsXtDJyn)kRD!7^3@DnJj3o>}%CQ9jOas;c0BJ(d1(CBwipxsBwGPC83i1#0w$>!3)Ee^SZlV7e-t8{c@-iI*m*^}K#kBf6(NBKe*(xpN`2qF3 Wb5`Bx1@XH?pno2C=;*@We&q{Q4XAhk delta 585 zcmaKou};EJ6o!kypoWymXaI8-qXRT)F)`_;GB8*}(&*rJp+~r(+*|K0G`R2#rcdC2 zVPGJ+PhxxleGV6I2c{C2GyLcO&Y%ChFAE>b!e&)0a*1kPRQm^alp*v5lCffy&qB%L z0@E8)l@K^ff6cmoI~4+13>`iplo>%dv=}Bd(3&L&JVJ|chQ>XQ;Xz`s%Mg(v8rwTP zGE^_s<4WB}F+%|YWyD#40VFgYK|Dg3pjtJWrrGkmR;L5quIqWO@25Y_ud^-29pgXCy4_g(vj@kujWN!pC9@nW zi_k;pN;%5QWQa*$<_MXPC=d8r1xXhH<_Z0rI8Qukl@3Ul3&`xdnr;EGU1ulc*v3h& Z$(B;9%ct6*KcDn@2+#Vbs@i+o`vY;i(ANL} diff --git a/res/lang/pl.bin b/res/lang/pl.bin index 877ffaf7c8b65210a47e6f70825eaf81fa3f579a..9f42024c6a69a98cb430f33e34d51bd04a3dcc35 100644 GIT binary patch delta 40 vcmeC##Mr-{af5+{Xl6-jE<ey;Fi=#XI5Q;`qM;tyQ)Q_|C73$GfTEenSi%6L99s~;G++$?kR~Mmi^6>Z N*9G+b=28nOc>rr-mwf;L diff --git a/res/lang/ru.bin b/res/lang/ru.bin index 8301f8d41cb9e717a9d5b943d74838ccc0074989..3cacac362d77070ab862c7c1379c07fb518117a7 100644 GIT binary patch delta 40 vcmaFc!1UoS;|9$j(ae(6T!!F+oXir1vdq+Sh1}GNC diff --git a/res/lang/sr.bin b/res/lang/sr.bin index 75fe0b990839491a0ce5e257148e1fa9f2ac0912..af0acbf90faf376fc0af3a864c5541d46ae187b1 100644 GIT binary patch delta 684 zcmZ{hze^)Q6vsD;nA0FgTs3=%jE#bjh$*fJdd*qKgZm4F8;+oEf{8{ulQaj{Wde#n zkQ1*I_FR`+G>Nun<9A9y3;zPKu+Tz%V=R)WEHm?%_kG{_ytfy(o~t{Lwb#~#Rai2Q zeN^QNTzkJQ)U9KiVh2a4qRgJd16cNXZ@9&aB3$_sj_3$n_hG$OC3EE9s>M)&B_0F8 zkJurHLs^g;be0(olo^E;StuGkK{IJ`4O?&+4x3FV-=3QOLHQjq-Wjr!M!_#`M*YIa zdVESO3#tfZ+aFod4F;D`>1k2>!q~)S7$ubK-7kZlZmi)S_2o5--m1kbWLZZ5=xFP`+02eHBxpW{Ott%APfMyT0!k`*x}LKNW1~{2iVBFvW+1 Z*saZt(Eu$ba|BVwU%ESjW1CsC^$FqfbsYcz delta 611 zcmaF(lkv`1#tmy(S)Ft8i&Ho6W|bA>^2y9gRY)pIP0Zf>R!otP(Nn#E|c4}p@UNK049!O3v10-c=#DGVSf}xcWc6~;M*z|G0ESoGHAdTr5-_)Y? zRE3hnq+$$1i^~%WFii{wiYgRmrlewO00v$OriL(}Xl63Rv-K#x1*ym8S(py2UIl5w x=2N&PBP&B>ujHjxlrUVFf3e}h)(aaq^9OmTa|c)ECgtZSqygh#b8%%JGXTlvj9W*MB1i07a1x(EtDd delta 424 zcmaDhi}CSX#toKwlcV$$>T^@`O7$}Gi!!Sif(vpoOBBj7Q_B@VqE-qXAmRMHlEfT_ z?9|F)y<(68J%kQJBYb)k46Tf?>oYQh>#N6NnSzm(A%@1>)S~oMxHh;hUy!guNn%nl zhK}O$!~#qW!9Y=k;>?s(h=zJ(PnD$>m0;=!1BzxQV+jM0a%@2W(||PqK$?*JFADbw OTo=&yoAdO3$N>N<3z)kA diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin index 66c62937a152658de375631d5e79a689a19768bf..b155036dcef1ca343d25faac01be32f37ece0d03 100644 GIT binary patch delta 40 wcmZpj!q_p9al;C2(ae(6T!!F+oXir1vdq+Sh1}GCTn`05voY{Qv*} delta 424 zcmeB}$k;lCal;Dj$tSf{>T^@`O7$}Gi!!Sif(vpoOBBj7Q_B@VqE-qXAmRMHlEfT_ z?9|F)y<(68J%kQJBYb)k46Tf?>oYQh>#N6NnSzm(A%@1>)S~oMxHh;hUy!guNn%nl zhK}O$!~#qW!9Y=k;>?s(h=zJ(PnD$>m0;=!1BzxQV+jM0a%@2W(||PqK$?*JFADbw OTo=&yn;&W~mjM7gOPJ;W diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin index 57e310e20189e2d1abc1039c2507dc0b688a508e..57ce2d83ddea4d33e9ed1ee3b6455d27242c5d94 100644 GIT binary patch delta 40 wcmdltmGR&t#tlq5qM0SBxeUPtIhiF2Wtpkv3c0CyrB;)_Y3px3tovIA05(hy-T(jq delta 424 zcmX>&iE-al#tlq5la+Op>vL1{O7$}Gi!!Sif(vpoOBBj7Q_B@VqE-qXAmRMHlEfT_ z?9|F)y<(68J%kQJBYb)k46Tf?>oYQh>#N6NnSzm(A%@1>)S~oMxHh;hUy!guNn%nl zhK}O$!~#qW!9Y=k;>?s(h=zJ(PnD$>m0;=!1BzxQV+jM0a%@2W(||PqK$?*JFADbw NTo=&yo2_)%WdYudmdXGC 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). */ -- 2.34.1