Merge pull request #11 from vaeth/master

Actualización del repositorio padre.
vaeth · Jan 23, 2018 · 835e2e3 · 835e2e3
2 parents 581c6e1 + 544c84d
commit 835e2e3
Show file tree

Hide file tree

Showing 13 changed files with 807 additions and 383 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,18 +2,36 @@
 
 *bookmarkdupes-5.0:
 	Martin Väth <martin at mvath.de>:
-	- Add expert rules to ignore certain bookmarks.
-	  Storage permissions are required to store these expert rules locally.
-	- Use expert rules to define when bookmarks are considered to be dupes.
+	- Add expert rules to ignore ("filter") certain bookmarks.
+	  Storage permissions are required to store these expert rules in
+	  the local or sync storage.
+	- Expert rules can define when bookmarks are considered as dupes.
 	  This replaces the previous unsatisfactory "Similar Dupes" button and
 	  implements also https://github.com/vaeth/bookmarkdupes/issues/45
-	- Default regexp rules deal with much more than \? tails
+	- Default expert rules deal with much more than \? tails.
+	  Actually, the \? tails rule is now by default deactivated because it
+	  has too many false positives: only relatively safe rules are active
+	  in the defaults, and in addition one locale-specific example of a
+	  filter rule.
+	- Remove tabs permissions.
+	  The price is that several tabs open when clicked several times
 	- bugfix: increase minimal gecko version to 48.0 to reflect that
 	  manifest.json itself apparently requires that version, see
 	  https://github.com/vaeth/bookmarkdupes/issues/44
 	- bugfix: calculation error messages are now displayed correctly
-	- bugfix: use safe ids for bookmarks
+	- bugfix: use safe (guaranteed non-duplicate) ids for bookmarks
+	- bugfix: add some forgotten semicolons. Another missing semicolon
+	  (in menwhile changed code) might also have been a reason for
+	  https://github.com/vaeth/bookmarkdupes/issues/38
+	  However, currently the options page is not removed: some users might
+	  find it convenient.
 	- internal: remove redundant SplitNumber
+	- internal: avoid arguments array when simple args passing will do
+	- internal: improve some function names
+
+	Henaro aka Ironwool:
+	- Update uk locales
+	- Update ru locales
 
 	Juan Salvador Aleixandre Talens:
 	- Update es locales

diff --git a/README.md b/README.md
@@ -38,8 +38,7 @@ the corresponding bookmarks to their previous location in the bookmark menu!
 The extension requires the following permissions for these reasons:
 
 1. "bookmarks" to read/modify bookmarks
-2. "tabs" to let the extension symbol activate the correct tab if it open.
-3. "storage" to store/restore the customized rules in expert mode.
+2. "storage" to store/restore the customized rules in expert mode.
    Unfortunately, "storage" is not one of the optional_permissions which might
    be required only if that feature is actually requested by the user, see
    https://developer.mozilla.org/en-US/Add-ons/WebExtensions/manifest.json/optional_permissions

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -61,15 +61,15 @@
   },
   "titleRuleUrl": {
     "message": "Die Regel trifft auf ein Lesezeichen zu, wenn dessen URL auf den regulären Ausdruck passt.",
-    "description": "Explain that bookmarks whose URL matches the regular expression"
+    "description": "Explain that bookmarks whose URL matches the regular expression will be selected"
   },
   "ruleUrlNegation": {
     "message": "URL passt nicht",
     "description": "Input field for matching the URL. The text should be short"
   },
   "titleRuleUrlNegation": {
     "message": "Die Regel trifft auf ein Lesezeichen zu, wenn dessen URL nicht auf den regulären Ausdruck passt.",
-    "description": "Explain that bookmarks whose URL does not match the regular expression"
+    "description": "Explain that bookmarks whose URL does not match the regular expression will be selected"
   },
   "ruleSearch": {
     "message": "Ersetze URL-Teil",
@@ -87,26 +87,98 @@
     "message": "Der Ersetzungstext für den passenden Teil des regulären Ausdrucks. Symbole wie $$& oder $$1 können benutzt werden, um auf Treffer oder Klammern zu verweisen. Die speziellen Texte \\L$$& und \\U$$& bedeuten eine klein- bzw. großgeschriebene Version der Treffer.",
     "description": "Explain that the text will be used as replacement text for the regular expression matches"
   },
-  "buttonRuleAdd": {
-    "message": "Neu",
-    "description": "Button for inserting a new rule. The text should be short"
+  "buttonRuleUp": {
+    "message": "⇧",
+    "description": "Button for moving a rule up. The text should be short"
   },
-  "titleButtonRuleAdd": {
-    "message": "Einfügen einer neuen Regel.",
-    "description": "Explain that a new rule will be inserted"
+  "titleButtonRuleUp": {
+    "message": "Die Regel wird nach oben verschoben.",
+    "description": "Explain that the rule will be moved up"
+  },
+  "buttonRuleDown": {
+    "message": "⇩",
+    "description": "Button for moving a rule down. The text should be short"
+  },
+  "titleButtonRuleDown": {
+    "message": "Die Regel wird nach unten verschoben.",
+    "description": "Explain that the rule will be moved down"
   },
   "buttonRuleSub": {
-    "message": "Löschen",
+    "message": "❌",
     "description": "Button for removing a rule. The text should be short"
   },
   "titleButtonRuleSub": {
     "message": "Löschen dieser Regel.",
     "description": "Explain that the rule will be removed"
   },
+  "buttonRuleAdd": {
+    "message": "❎",
+    "description": "Button for inserting a new rule. The text should be short"
+  },
+  "titleButtonRuleAdd": {
+    "message": "Einfügen einer neuen Regel.",
+    "description": "Explain that a new rule will be inserted"
+  },
   "regExpFrequent": {
     "message": "[hH]äufig.*|[oO]ft|[dD]uplikate",
     "description": "A regular expression for folder names which intentionally might contain duplicate bookmarks (e.g. \"Frequently used\"). The expression is enclosed into \\0(...)\\0"
   },
+  "buttonRulesDefault": {
+    "message": "⇇ voreingestellte Regeln",
+    "description": "Button for restoring default rules. The text should be short"
+  },
+  "titleButtonRulesDefault": {
+    "message": "Ersetzen der angezeigten Regeln durch die fest voreingestellten",
+    "description": "Explain that current rules will be replaced by default rules"
+  },
+  "buttonRulesStoreLocal": {
+    "message": "⇉ lokaler Speicher",
+    "description": "Button for putting rules to local storage. The text should be short"
+  },
+  "titleButtonRulesStoreLocal": {
+    "message": "Kopieren der angezeigten Regeln in die des lokalen Browser-Speichers. Frühere Speicherungen werden dabei ggf. verworfen.",
+    "description": "Explain that current rules will replace those in the browser's local storage area"
+  },
+  "buttonRulesRestoreLocal": {
+    "message": "⇇ lokaler Speicher",
+    "description": "Button for restoring rules from local storage. The text should be short"
+  },
+  "titleButtonRulesRestoreLocal": {
+    "message": "Ersetzen der angezeigten Regeln durch die des lokalen Browser-Speichers",
+    "description": "Explain that current rules will be replaced by those from the browser's local storage area"
+  },
+  "buttonRulesCleanLocal": {
+    "message": "❌ lokaler Speicher",
+    "description": "Button for cleaning local storage. The text should be short"
+  },
+  "titleButtonRulesCleanLocal": {
+    "message": "Der lokale Browser-Speicher wird von allen gespeicherten Regeln befreit",
+    "description": "Explain that the browser's local storage area will be cleaned from stored rules"
+  },
+  "buttonRulesStoreSync": {
+    "message": "⇉ Sync-Speicher",
+    "description": "Button for putting rules to sync storage. The text should be short"
+  },
+  "titleButtonRulesStoreSync": {
+    "message": "Kopieren der angezeigten Regeln in die des Sync-Speichers des Browsers. Frühere Speicherungen werden dabei ggf. verworfen.",
+    "description": "Explain that current rules will replace those in the browser's sync storage area"
+  },
+  "buttonRulesRestoreSync": {
+    "message": "⇇ Sync-Speicher",
+    "description": "Button for restoring rules from sync storage. The text should be short"
+  },
+  "titleButtonRulesRestoreSync": {
+    "message": "Ersetzen der angezeigten Regeln durch die des Sync-Speichers des Browsers",
+    "description": "Explain that current rules will be replaced by those from the browser's sync storage area"
+  },
+  "buttonRulesCleanSync": {
+    "message": "❌ Sync-Speicher",
+    "description": "Button for cleaning sync storage. The text should be short"
+  },
+  "titleButtonRulesCleanSync": {
+    "message": "Der Sync-Speicher des Browsers wird von allen gespeicherten Regeln befreit",
+    "description": "Explain that the sync browser's storage area will be cleaned from stored rules"
+  },
   "buttonRulesDefault": {
     "message": "Voreingestelle Regeln zurückholen",
     "description": "Button for restoring default rules. The text should be short"

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -69,7 +69,7 @@
   },
   "titleRuleUrlNegation": {
     "message": "The rule applies to a bookmark if its URL does not match the regular expression.",
-    "description": "Explain that bookmarks whose URL does not matche the regular expression will be selected"
+    "description": "Explain that bookmarks whose URL does not match the regular expression will be selected"
   },
   "ruleSearch": {
     "message": "Replace URL matches",
@@ -87,57 +87,97 @@
     "message": "The replacement text for the regular expresssion matches. Symbols like $$& or $$1 can be used to refer to the match or a brace content. The special texts \\L$$& and \\U$$& mean a lower and upper case version of the matches, respectively.",
     "description": "Explain that the text will be used as replacement text for the regular expression matches"
   },
-  "buttonRuleAdd": {
-    "message": "New",
-    "description": "Button for inserting a new rule. The text should be short"
+  "buttonRuleUp": {
+    "message": "⇧",
+    "description": "Button for moving a rule up. The text should be short"
   },
-  "titleButtonRuleAdd": {
-    "message": "Insert a new rule.",
-    "description": "Explain that a new rule will be inserted"
+  "titleButtonRuleUp": {
+    "message": "The rule will be moved up.",
+    "description": "Explain that the rule will be moved up"
+  },
+  "buttonRuleDown": {
+    "message": "⇩",
+    "description": "Button for moving a rule down. The text should be short"
+  },
+  "titleButtonRuleDown": {
+    "message": "The rule will be moved down.",
+    "description": "Explain that the rule will be moved down"
   },
   "buttonRuleSub": {
-    "message": "Remove",
+    "message": "❌",
     "description": "Button for removing a rule. The text should be short"
   },
   "titleButtonRuleSub": {
     "message": "Remove this rule.",
     "description": "Explain that the rule will be removed"
   },
+  "buttonRuleAdd": {
+    "message": "❎",
+    "description": "Button for inserting a new rule. The text should be short"
+  },
+  "titleButtonRuleAdd": {
+    "message": "Insert a new rule.",
+    "description": "Explain that a new rule will be inserted"
+  },
   "regExpFrequent": {
     "message": "[fF]requent.*|[oO]ften|[dD]upes",
     "description": "A regular expression for folder names which intentionally might contain duplicate bookmarks (e.g. \"Frequently used\"). The expression is enclosed into \\0(...)\\0"
   },
   "buttonRulesDefault": {
-    "message": "Restore default rules", // news
+    "message": "⇇ default rules",
     "description": "Button for restoring default rules. The text should be short"
   },
   "titleButtonRulesDefault": {
-    "message": "Restore the default rules. Any changes will be lost", // new
-    "description": "Explain that default rules will be restored"
+    "message": "Replace the currently displayed rules by default rules.",
+    "description": "Explain that current rules will be replaced by default rules"
+  },
+  "buttonRulesStoreLocal": {
+    "message": "⇉ local storage",
+    "description": "Button for putting rules to local storage. The text should be short"
+  },
+  "titleButtonRulesStoreLocal": {
+    "message": "Put the current rules to the browser's local storage area, possibly replacing earlier stored rules.",
+    "description": "Explain that current rules will replace those in the browser's local storage area"
+  },
+  "buttonRulesRestoreLocal": {
+    "message": "⇇ local storage",
+    "description": "Button for restoring rules from local storage. The text should be short"
+  },
+  "titleButtonRulesRestoreLocal": {
+    "message": "Replace the currently displayed rules by those from the browser's local storage area.",
+    "description": "Explain that current rules will be replaced by those from the browser's local storage area"
+  },
+  "buttonRulesCleanLocal": {
+    "message": "❌ local storage",
+    "description": "Button for cleaning local storage. The text should be short"
+  },
+  "titleButtonRulesCleanLocal": {
+    "message": "The browser's local storage area will be cleaned from stored rules. The stored rules will be lost.",
+    "description": "Explain that the browser's local storage area will be cleaned from stored rules"
   },
-  "buttonRulesStore": {
-    "message": "Store rules", // news
-    "description": "Button for putting current rules to local storage. The text should be short"
+  "buttonRulesStoreSync": {
+    "message": "⇉ sync storage",
+    "description": "Button for putting rules to sync storage. The text should be short"
   },
-  "titleButtonRulesStore": {
-    "message": "The current rules will be put to the browser's local storage area.", // new
-    "description": "Explain that current rules will be put to local storage"
+  "titleButtonRulesStoreSync": {
+    "message": "Put the current rules to the browser's sync storage area, possibly replacing earlier stored rules.",
+    "description": "Explain that current rules will replace those in the browser's sync storage area"
   },
-  "buttonRulesRestore": {
-    "message": "Restore rules", // news
-    "description": "Button for fetching rules from local storage. The text should be short"
+  "buttonRulesRestoreSync": {
+    "message": "⇇ sync storage",
+    "description": "Button for restoring rules from sync storage. The text should be short"
   },
-  "titleButtonRulesRestore": {
-    "message": "The rules will be replaced by those stored in the browser's local storage area. Any changes will be lost.", // new
-    "description": "Explain that rules will be fetched from local storage"
+  "titleButtonRulesRestoreSync": {
+    "message": "Replace the currently displayed rules by those from the browser's sync storage area.",
+    "description": "Explain that current rules will be replaced by those from the browser's sync storage area"
   },
-  "buttonRulesClean": {
-    "message": "Cleanup storage", // news
-    "description": "Button for cleaning local storage from stored rules. The text should be short"
+  "buttonRulesCleanSync": {
+    "message": "❌ sync storage",
+    "description": "Button for cleaning sync storage. The text should be short"
   },
-  "titleButtonRulesClean": {
-    "message": "The browser's local storage area will be cleaned from stored rules. The stored rules will be lost.", // new
-    "description": "Explain that the local storage will be cleaned from stored rules"
+  "titleButtonRulesCleanSync": {
+    "message": "The browser's sync storage area will be cleaned from stored rules. The stored rules will be lost.",
+    "description": "Explain that the sync browser's storage area will be cleaned from stored rules"
   },
   "buttonListDupes": {
     "message": "Dupes",
@@ -392,7 +432,7 @@
     }
   },
   "titleMessageMatches": {
-    "message": "Two bookmarks are considered to be dupes if their URLs coincide. In expert mode, the selected URL preprocessing (substitution) rules are applied before the URLs are compared.", // new
+    "message": "Two bookmarks are considered to be dupes if their URLs coincide. In expert mode, the selected URL preprocessing (substitution) rules are applied before the URLs are compared.",
     "description": "Explain how bookmark dupes are defined"
   },
   "messageEmpty": {