[Pkg-mozext-commits] [tabmixplus] 55/147: Shortcut for 'Merges windows together' changed to Ctrl+Shift+E, Ctrl+Shift+M overrides 'Responsive Design Mode' shortcut
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 9b8f594bd3551bdc036b8b9bbeed4e18970ca9e2
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Dec 6 20:27:41 2016 +0200
Shortcut for 'Merges windows together' changed to Ctrl+Shift+E, Ctrl+Shift+M overrides 'Responsive Design Mode' shortcut
---
chrome/locale/ar/tabmix.dtd | 2 +-
chrome/locale/bg-BG/tabmix.dtd | 2 +-
chrome/locale/da/tabmix.dtd | 2 +-
chrome/locale/en-US/tabmix.dtd | 2 +-
chrome/locale/eu/tabmix.dtd | 2 +-
chrome/locale/fi/tabmix.dtd | 2 +-
chrome/locale/fr/tabmix.dtd | 2 +-
chrome/locale/hu-HU/tabmix.dtd | 2 +-
chrome/locale/it/tabmix.dtd | 2 +-
chrome/locale/ja/tabmix.dtd | 2 +-
chrome/locale/ko-KR/tabmix.dtd | 2 +-
chrome/locale/pt-BR/tabmix.dtd | 2 +-
chrome/locale/ro/tabmix.dtd | 2 +-
chrome/locale/ru-RU/tabmix.dtd | 2 +-
chrome/locale/sk-SK/tabmix.dtd | 2 +-
chrome/locale/uk-UA/tabmix.dtd | 2 +-
chrome/locale/vi/tabmix.dtd | 2 +-
chrome/locale/zh-CN/tabmix.dtd | 2 +-
chrome/locale/zh-TW/tabmix.dtd | 2 +-
modules/Shortcuts.jsm | 16 +++++++++++++++-
20 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/chrome/locale/ar/tabmix.dtd b/chrome/locale/ar/tabmix.dtd
index c7a2c57..feb34b3 100644
--- a/chrome/locale/ar/tabmix.dtd
+++ b/chrome/locale/ar/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Sorted Tabs">
<!ENTITY sortedTabs.tooltip "Check to show the list sorted alphabetically">
<!ENTITY enable.label "Enable">
diff --git a/chrome/locale/bg-BG/tabmix.dtd b/chrome/locale/bg-BG/tabmix.dtd
index 5fc802a..6f44e20 100644
--- a/chrome/locale/bg-BG/tabmix.dtd
+++ b/chrome/locale/bg-BG/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "П">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Сортирани подпрозорци">
<!ENTITY sortedTabs.tooltip "Изберете, за да виждате списъка по азбучен ред">
<!ENTITY enable.label "Включено:">
diff --git a/chrome/locale/da/tabmix.dtd b/chrome/locale/da/tabmix.dtd
index ec59877..834da60 100644
--- a/chrome/locale/da/tabmix.dtd
+++ b/chrome/locale/da/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "æ">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Sorterede faneblade">
<!ENTITY sortedTabs.tooltip "Markér for at vise listen sorteret alfabetisk">
<!ENTITY enable.label "Aktiveret">
diff --git a/chrome/locale/en-US/tabmix.dtd b/chrome/locale/en-US/tabmix.dtd
index 2f8af93..a55d81e 100644
--- a/chrome/locale/en-US/tabmix.dtd
+++ b/chrome/locale/en-US/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Sorted Tabs">
<!ENTITY sortedTabs.tooltip "Check to show the list sorted alphabetically">
<!ENTITY enable.label "Enable">
diff --git a/chrome/locale/eu/tabmix.dtd b/chrome/locale/eu/tabmix.dtd
index f9e24da..cb87b53 100644
--- a/chrome/locale/eu/tabmix.dtd
+++ b/chrome/locale/eu/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Sorted Tabs">
<!ENTITY sortedTabs.tooltip "Check to show the list sorted alphabetically">
<!ENTITY enable.label "Enable">
diff --git a/chrome/locale/fi/tabmix.dtd b/chrome/locale/fi/tabmix.dtd
index 270226a..c66ac1c 100644
--- a/chrome/locale/fi/tabmix.dtd
+++ b/chrome/locale/fi/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Sorted Tabs">
<!ENTITY sortedTabs.tooltip "Check to show the list sorted alphabetically">
<!ENTITY enable.label "Enable">
diff --git a/chrome/locale/fr/tabmix.dtd b/chrome/locale/fr/tabmix.dtd
index e375e7a..5fe1703 100644
--- a/chrome/locale/fr/tabmix.dtd
+++ b/chrome/locale/fr/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "A">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Onglets triés">
<!ENTITY sortedTabs.tooltip "Cocher pour afficher la liste triée alphabétiquement">
<!ENTITY enable.label "Activer">
diff --git a/chrome/locale/hu-HU/tabmix.dtd b/chrome/locale/hu-HU/tabmix.dtd
index 55cf6eb..663579d 100644
--- a/chrome/locale/hu-HU/tabmix.dtd
+++ b/chrome/locale/hu-HU/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "M">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Rendezett lapok">
<!ENTITY sortedTabs.tooltip "Lista megjelenítése ABC sorrendben">
<!ENTITY enable.label "Engedélyezés">
diff --git a/chrome/locale/it/tabmix.dtd b/chrome/locale/it/tabmix.dtd
index d2c591a..f048eb2 100644
--- a/chrome/locale/it/tabmix.dtd
+++ b/chrome/locale/it/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Schede in ordine alfabetico">
<!ENTITY sortedTabs.tooltip "Visualizza le schede in ordine alfabetico">
<!ENTITY enable.label "Attiva, ricarica ogni">
diff --git a/chrome/locale/ja/tabmix.dtd b/chrome/locale/ja/tabmix.dtd
index 7d2727f..63f9efc 100644
--- a/chrome/locale/ja/tabmix.dtd
+++ b/chrome/locale/ja/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "タブをソート">
<!ENTITY sortedTabs.tooltip "アルファベット順にソートしたタブリストを表示">
<!ENTITY enable.label "有効">
diff --git a/chrome/locale/ko-KR/tabmix.dtd b/chrome/locale/ko-KR/tabmix.dtd
index ce7a104..7ca0cd5 100644
--- a/chrome/locale/ko-KR/tabmix.dtd
+++ b/chrome/locale/ko-KR/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "탭 정렬">
<!ENTITY sortedTabs.tooltip "선택하면 목록을 이름 순으로 정렬합니다.">
<!ENTITY enable.label "쓰기">
diff --git a/chrome/locale/pt-BR/tabmix.dtd b/chrome/locale/pt-BR/tabmix.dtd
index 2bd38d5..dc969e2 100644
--- a/chrome/locale/pt-BR/tabmix.dtd
+++ b/chrome/locale/pt-BR/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Ordenar abas">
<!ENTITY sortedTabs.tooltip "Seleciona para mostrar lista ordenada alfabeticamente">
<!ENTITY enable.label "Ativar">
diff --git a/chrome/locale/ro/tabmix.dtd b/chrome/locale/ro/tabmix.dtd
index b2e3100..4f3ea94 100644
--- a/chrome/locale/ro/tabmix.dtd
+++ b/chrome/locale/ro/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "n">
<!ENTITY tab.key "F">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "File sortate">
<!ENTITY sortedTabs.tooltip "Afișează lista sortată alfabetic">
<!ENTITY enable.label "Activează">
diff --git a/chrome/locale/ru-RU/tabmix.dtd b/chrome/locale/ru-RU/tabmix.dtd
index fb0b035..1316ba4 100644
--- a/chrome/locale/ru-RU/tabmix.dtd
+++ b/chrome/locale/ru-RU/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "н">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Отсортированные вкладки">
<!ENTITY sortedTabs.tooltip "Отметьте, чтобы показать отсортированный по алфавиту список">
<!ENTITY enable.label "Использовать">
diff --git a/chrome/locale/sk-SK/tabmix.dtd b/chrome/locale/sk-SK/tabmix.dtd
index 8dfafc6..0221494 100644
--- a/chrome/locale/sk-SK/tabmix.dtd
+++ b/chrome/locale/sk-SK/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Triedené karty">
<!ENTITY sortedTabs.tooltip "Kontrola zobrazenia zoznamu triedeného abecedne">
<!ENTITY enable.label "Zapnúť">
diff --git a/chrome/locale/uk-UA/tabmix.dtd b/chrome/locale/uk-UA/tabmix.dtd
index a64a75c..4b5c512 100644
--- a/chrome/locale/uk-UA/tabmix.dtd
+++ b/chrome/locale/uk-UA/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Сортувати вкладки">
<!ENTITY sortedTabs.tooltip "Відмітьте, щоб показати відсортований по алфавіту список">
<!ENTITY enable.label "Застосувати">
diff --git a/chrome/locale/vi/tabmix.dtd b/chrome/locale/vi/tabmix.dtd
index 92b6940..1a8ece2 100644
--- a/chrome/locale/vi/tabmix.dtd
+++ b/chrome/locale/vi/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "B">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "Thẻ đã xếp">
<!ENTITY sortedTabs.tooltip "Chọn để hiện danh sách được xếp theo thứ tự ABC">
<!ENTITY enable.label "Kích hoạt">
diff --git a/chrome/locale/zh-CN/tabmix.dtd b/chrome/locale/zh-CN/tabmix.dtd
index 12c4f83..51643e5 100644
--- a/chrome/locale/zh-CN/tabmix.dtd
+++ b/chrome/locale/zh-CN/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "标签页排序">
<!ENTITY sortedTabs.tooltip "检查并按字母表顺序显示列表">
<!ENTITY enable.label "启用">
diff --git a/chrome/locale/zh-TW/tabmix.dtd b/chrome/locale/zh-TW/tabmix.dtd
index 9c9a9f4..cdcdb87 100644
--- a/chrome/locale/zh-TW/tabmix.dtd
+++ b/chrome/locale/zh-TW/tabmix.dtd
@@ -112,7 +112,7 @@
<!ENTITY sm.context.details.key "C">
<!ENTITY tab.key "T">
<!ENTITY window.key "N">
-<!ENTITY merge.key "M">
+<!ENTITY merge.key "E">
<!ENTITY sortedTabs.label "依名稱排序列表">
<!ENTITY sortedTabs.tooltip "勾選此項顯示已排序的列表">
<!ENTITY enable.label "啟用">
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index 60d1cad..b8353af 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -26,7 +26,7 @@ this.Shortcuts = {
copyTabUrl: {command: 28},
pasteTabUrl: {command: 29},
selectMerge: {command: 22},
- mergeWin: {default: "M accel,shift"},
+ mergeWin: {default: "E accel,shift"},
addBookmark: {id: "addBookmarkAsKb", default: "D accel"},
bookmarkAllTabs: {id: "bookmarkAllTabsKb", default: "D accel,shift"},
reload: {id: "key_reload", default: "R accel"},
@@ -94,6 +94,20 @@ this.Shortcuts = {
TabmixSvc.getString("undoclosetab.clear.label");
for (let key of Object.keys(this.keys)) {
let keyData = this.keys[key];
+ // get default value for all keys
+ // default can be different between languages
+ if (keyData.default) {
+ const elm = $(keyData.id || "key_tm_" + key);
+ if (elm) {
+ const modifiers = elm.getAttribute("modifiers");
+ const key_ = elm.getAttribute("key");
+ const keycode = elm.getAttribute("keycode");
+ const disabled = /^d&/.test(keyData.default || "") ? "d&" : "";
+ const newDefault = disabled + (key_ || keycode).toUpperCase() +
+ (modifiers ? " " + modifiers.replace(/\s/g, "") : "");
+ keyData.default = newDefault;
+ }
+ }
keyData.value = keyData.default || "";
if (container && key in labels)
keyData.label = labels[key];
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list