[Pkg-mozext-commits] [requestpolicy] 79/280: "Add rule" instead of "More…" (notif.bar label)

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:30:02 UTC 2015 

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit aa837c2223eb5f628ad21ea89c0b0d1db86a6666
Author: Martin Kimmerle <dev at 256k.de>
Date:   Wed Dec 31 12:21:41 2014 +0100

    "Add rule" instead of "More…" (notif.bar label)
    
    "Add rule" seems more adequate than "More…", for a button that
    opens a menu which allows adding rules.
---
 src/content/lib/xul-trees.js              |  2 +-
 src/content/ui/overlay.js                 | 31 ++++++++++++++++---------------
 src/locale/de/requestpolicy.properties    |  1 +
 src/locale/en-US/requestpolicy.properties |  1 +
 src/locale/eo/requestpolicy.properties    |  1 +
 src/locale/es-MX/requestpolicy.properties |  1 +
 src/locale/eu/requestpolicy.properties    |  1 +
 src/locale/fr/requestpolicy.properties    |  1 +
 src/locale/it/requestpolicy.properties    |  1 +
 src/locale/ja/requestpolicy.properties    |  1 +
 src/locale/ko-KR/requestpolicy.properties |  1 +
 src/locale/lv-LV/requestpolicy.properties |  1 +
 src/locale/nl/requestpolicy.properties    |  1 +
 src/locale/pt-BR/requestpolicy.properties |  1 +
 src/locale/ru-RU/requestpolicy.properties |  1 +
 src/locale/sk-SK/requestpolicy.properties |  1 +
 src/locale/sv-SE/requestpolicy.properties |  1 +
 src/locale/tr/requestpolicy.properties    |  1 +
 src/locale/uk-UA/requestpolicy.properties |  1 +
 src/locale/zh-CN/requestpolicy.properties |  1 +
 src/locale/zh-TW/requestpolicy.properties |  1 +
 21 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/content/lib/xul-trees.js b/src/content/lib/xul-trees.js
index 945162c..a316acc 100644
--- a/src/content/lib/xul-trees.js
+++ b/src/content/lib/xul-trees.js
@@ -59,7 +59,7 @@ let mainTree = [
   {parent: {special: {type: "__window__"}},
       tag: "popupset", id: "requestpolicyPopupset",
   children: [
-    {tag: "menupopup", id: "requestpolicyRedirectNotificationOptions"},
+    {tag: "menupopup", id: "requestpolicyRedirectAddRuleMenu"},
     {tag: "menupopup", id: "rp-popup", noautohide: "true",
         position: "after_start",
         onpopupshowing: "requestpolicy.overlay.onPopupShowing(event);",
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 2ff48bb..47e5a02 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -470,10 +470,11 @@ requestpolicy.overlay = (function() {
                                              [cropUri(redirectTargetUri, 50)],
                                              1);
 
-    var optionsPopupName = "requestpolicyRedirectNotificationOptions";
-    var optionsPopup = document.getElementById(optionsPopupName);
-    while (optionsPopup.firstChild) {
-      optionsPopup.removeChild(optionsPopup.firstChild);
+    // TODO: create `XULUtils.removeAllChildren`
+    var addRuleMenuName = "requestpolicyRedirectAddRuleMenu";
+    var addRulePopup = document.getElementById(addRuleMenuName);
+    while (addRulePopup.firstChild) {
+      addRulePopup.removeChild(addRulePopup.firstChild);
     }
 
     let m = requestpolicy.menu;
@@ -481,16 +482,16 @@ requestpolicy.overlay = (function() {
     var dest = m._addWildcard(DomainUtil.getBaseDomain(redirectTargetUri));
 
     let cm = requestpolicy.classicmenu;
-    cm.addMenuItemTemporarilyAllowDest(optionsPopup, dest);
-    cm.addMenuItemAllowDest(optionsPopup, dest);
-    cm.addMenuSeparator(optionsPopup);
+    cm.addMenuItemTemporarilyAllowDest(addRulePopup, dest);
+    cm.addMenuItemAllowDest(addRulePopup, dest);
+    cm.addMenuSeparator(addRulePopup);
 
-    cm.addMenuItemTemporarilyAllowOrigin(optionsPopup, origin);
-    cm.addMenuItemAllowOrigin(optionsPopup, origin);
-    cm.addMenuSeparator(optionsPopup);
+    cm.addMenuItemTemporarilyAllowOrigin(addRulePopup, origin);
+    cm.addMenuItemAllowOrigin(addRulePopup, origin);
+    cm.addMenuSeparator(addRulePopup);
 
-    cm.addMenuItemTemporarilyAllowOriginToDest(optionsPopup, origin, dest);
-    cm.addMenuItemAllowOriginToDest(optionsPopup, origin, dest);
+    cm.addMenuItemTemporarilyAllowOriginToDest(addRulePopup, origin, dest);
+    cm.addMenuItemAllowOriginToDest(addRulePopup, origin, dest);
 
 
 
@@ -530,9 +531,9 @@ requestpolicy.overlay = (function() {
           }
         },
         {
-          label: StringUtils.$str("more"),
-          accessKey: StringUtils.$str("more.accesskey"),
-          popup: optionsPopupName,
+          label: StringUtils.$str("addRule"),
+          accessKey: StringUtils.$str("addRule.accesskey"),
+          popup: addRuleMenuName,
           callback: null
         }
         // TODO: add a „read more about URL redirection“ button, targetting to
diff --git a/src/locale/de/requestpolicy.properties b/src/locale/de/requestpolicy.properties
index 4371770..19632fc 100644
--- a/src/locale/de/requestpolicy.properties
+++ b/src/locale/de/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Ziel
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index 9902494..6796897 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destination
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/eo/requestpolicy.properties b/src/locale/eo/requestpolicy.properties
index 67a9892..9ced19a 100644
--- a/src/locale/eo/requestpolicy.properties
+++ b/src/locale/eo/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Celo
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/es-MX/requestpolicy.properties b/src/locale/es-MX/requestpolicy.properties
index cbd6866..8e99db2 100644
--- a/src/locale/es-MX/requestpolicy.properties
+++ b/src/locale/es-MX/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destino
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/eu/requestpolicy.properties b/src/locale/eu/requestpolicy.properties
index 41824fa..e05824d 100644
--- a/src/locale/eu/requestpolicy.properties
+++ b/src/locale/eu/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Helmuga
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/fr/requestpolicy.properties b/src/locale/fr/requestpolicy.properties
index 7b33f99..353b3b8 100644
--- a/src/locale/fr/requestpolicy.properties
+++ b/src/locale/fr/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destination
 block=Bloquer
 temporary=Temporaire
 addRule=Ajouter une règle
+addRule.accesskey=R
 learnMoreAboutRules=Plus d'informations sur les règles.
 learnMore=Plus d'informations.
 defaultPolicyDefinition=Quand vous n'avez ni règles autorisant ni règles interdisant une requête, voici ce que RequestPolicy fera.
diff --git a/src/locale/it/requestpolicy.properties b/src/locale/it/requestpolicy.properties
index 09bb463..09b4868 100644
--- a/src/locale/it/requestpolicy.properties
+++ b/src/locale/it/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destinazione
 block=Blocca
 temporary=Temporaneo
 addRule=Aggiungi regola
+addRule.accesskey=R
 learnMoreAboutRules=Approfondisci sulle regole.
 learnMore=Approfondisci.
 defaultPolicyDefinition=Questo è ciò che farà RequestPolicy quando non hai alcuna regola "permetti" o "blocca" relativa ad una richiesta.
diff --git a/src/locale/ja/requestpolicy.properties b/src/locale/ja/requestpolicy.properties
index efff501..65c2a9c 100644
--- a/src/locale/ja/requestpolicy.properties
+++ b/src/locale/ja/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=送信先
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/ko-KR/requestpolicy.properties b/src/locale/ko-KR/requestpolicy.properties
index 0969364..9f2e552 100644
--- a/src/locale/ko-KR/requestpolicy.properties
+++ b/src/locale/ko-KR/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=목적지 주소
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/lv-LV/requestpolicy.properties b/src/locale/lv-LV/requestpolicy.properties
index 6f290d8..ae1a859 100644
--- a/src/locale/lv-LV/requestpolicy.properties
+++ b/src/locale/lv-LV/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Mērķis
 block=Bloķēt
 temporary=Īslaicīgi
 addRule=Pievienot noteikumus
+addRule.accesskey=R
 learnMoreAboutRules=Uzziniet vairāk par noteikumiem.
 learnMore=Uzziniet vairāk.
 defaultPolicyDefinition=Gadījumā, ja vietnei nav definēti noteikumi, RequestPolicy pēc noklusejuma darbosies šādi.
diff --git a/src/locale/nl/requestpolicy.properties b/src/locale/nl/requestpolicy.properties
index c34cc4a..194ef1c 100644
--- a/src/locale/nl/requestpolicy.properties
+++ b/src/locale/nl/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Bestemming
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/pt-BR/requestpolicy.properties b/src/locale/pt-BR/requestpolicy.properties
index 8f16e87..e7cc151 100644
--- a/src/locale/pt-BR/requestpolicy.properties
+++ b/src/locale/pt-BR/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destino
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/ru-RU/requestpolicy.properties b/src/locale/ru-RU/requestpolicy.properties
index aab4445..ac7af20 100644
--- a/src/locale/ru-RU/requestpolicy.properties
+++ b/src/locale/ru-RU/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Цель
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/sk-SK/requestpolicy.properties b/src/locale/sk-SK/requestpolicy.properties
index 988dffa..9ca4cb0 100644
--- a/src/locale/sk-SK/requestpolicy.properties
+++ b/src/locale/sk-SK/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Ciele
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/sv-SE/requestpolicy.properties b/src/locale/sv-SE/requestpolicy.properties
index 685ebfe..93eff06 100644
--- a/src/locale/sv-SE/requestpolicy.properties
+++ b/src/locale/sv-SE/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Mål
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/tr/requestpolicy.properties b/src/locale/tr/requestpolicy.properties
index 84334bd..77980d8 100644
--- a/src/locale/tr/requestpolicy.properties
+++ b/src/locale/tr/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Hedef
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/uk-UA/requestpolicy.properties b/src/locale/uk-UA/requestpolicy.properties
index e5e1c0f..9cae3ae 100644
--- a/src/locale/uk-UA/requestpolicy.properties
+++ b/src/locale/uk-UA/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=Destination
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.
diff --git a/src/locale/zh-CN/requestpolicy.properties b/src/locale/zh-CN/requestpolicy.properties
index bb77044..8a75f80 100644
--- a/src/locale/zh-CN/requestpolicy.properties
+++ b/src/locale/zh-CN/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=目标
 block=阻止
 temporary=临时
 addRule=添加规则
+addRule.accesskey=R
 learnMoreAboutRules=了解更多规则
 learnMore=了解更多。
 defaultPolicyDefinition=在您没有为匹配请求设置“允许”或者“阻止”规则时，这将是 RequestPolicy 的默认行为。
diff --git a/src/locale/zh-TW/requestpolicy.properties b/src/locale/zh-TW/requestpolicy.properties
index 8275fcf..8f8123a 100644
--- a/src/locale/zh-TW/requestpolicy.properties
+++ b/src/locale/zh-TW/requestpolicy.properties
@@ -72,6 +72,7 @@ destination=目標
 block=Block
 temporary=Temporary
 addRule=Add rule
+addRule.accesskey=R
 learnMoreAboutRules=Learn more about rules.
 learnMore=Learn more.
 defaultPolicyDefinition=When you don't have any "allow" or "block" rules that match a request, this is what RequestPolicy will do.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git

More information about the Pkg-mozext-commits mailing list