Merge tag '1.9.17rc0'

nicole-ashley · Nov 28, 2016 · fab366b · fab366b
2 parents 85d7681 + 1e25fc7
commit fab366b
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json
@@ -231,7 +231,7 @@
 		"supportURL": "http://www.malwaredomains.com/"
 	},
 	"pgl.yoyo.org/as/serverlist": {
-		"title": "Peter Lowe’s Ad server list",
+		"title": "Peter Lowe’s Ad and tracking server list",
 		"group": "multipurpose",
 		"homeURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
 		"supportURL": "https://pgl.yoyo.org/adservers/"

diff --git a/dist/description/description-ms.txt b/dist/description/description-ms.txt
@@ -4,27 +4,27 @@ Kecekapan yang digambarkan:
 https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 (Bahasa English)
 
-Usage: The big power button in the popup is to permanently disable/enable uBlock for the current web site. It applies to the current web site only, it is not a global power button.
+Cara menguna: Butang besar di dalam popup adalah untuk mengaktifkan/menyahaktifkan uBlock bagi laman web yang terkini. It applies to the current web site only, it is not a global power button.
 
 ***
 
 Flexible, it's more than an "ad blocker": it can also read and create filters from hosts files.
 
-Out of the box, these lists of filters are loaded and enforced:
+Senarai penapis yang telah dimuatkan and dikuatkuasakan adalah yang berikutnya:
 
 - EasyList
 - Peter Lowe’s Ad server list
 - EasyPrivacy
 - Malware domains
 
-More lists are available for you to select if you wish:
+Banyak lagi senarai penapis yang boleh anda pilih seperti:
 
 - Fanboy’s Enhanced Tracking List
 - Dan Pollock’s hosts file
 - hpHosts’s Ad and tracking servers
 - MVPS HOSTS
 - Spam404
-- And many others
+- dan banyak lagi
 
 Of course, the more filters enabled, the higher the memory footprint. Yet, even after adding Fanboy's two extra lists, hpHosts’s Ad and tracking servers, uBlock still has a lower memory footprint than other very popular blockers out there.
 

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.9.17.10",
+    "version": "1.9.17.100",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/platform/edge/manifest.json b/platform/edge/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.9.17.10",
+    "version": "1.9.17.100",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/src/_locales/eo/messages.json b/src/_locales/eo/messages.json
@@ -540,7 +540,7 @@
     "description":"English: project' wiki on Github"
   },
   "aboutSupport":{
-    "message":"Support",
+    "message":"Helpo",
     "description":"A link for where to get support"
   },
   "aboutCode":{
@@ -688,7 +688,7 @@
     "description":"for generic 'Submit' buttons"
   },
   "genericApplyChanges":{
-    "message":"Apply changes",
+    "message":"Apliki ŝanĝojn",
     "description":"for generic 'Apply changes' buttons"
   },
   "genericRevert":{

diff --git a/src/_locales/fa/messages.json b/src/_locales/fa/messages.json
@@ -688,7 +688,7 @@
     "description":"for generic 'Submit' buttons"
   },
   "genericApplyChanges":{
-    "message":"Apply changes",
+    "message":"اعمال تغییرات",
     "description":"for generic 'Apply changes' buttons"
   },
   "genericRevert":{

diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
@@ -72,7 +72,7 @@
     "description":"English: Click to open the dashboard"
   },
   "popupTipPicker":{
-    "message":"Aller au sélecteur d'élément",
+    "message":"Activer le sélecteur d'élément",
     "description":"English: Enter element picker mode"
   },
   "popupTipLog":{
@@ -212,7 +212,7 @@
     "description":""
   },
   "settingsAdvancedUserSettings":{
-    "message":"paramètres avancés",
+    "message":"Paramètres avancés",
     "description":"For the tooltip of a link which gives access to advanced settings"
   },
   "settingsPrefetchingDisabledPrompt":{
@@ -424,7 +424,7 @@
     "description":"English: dynamic rule syntax and full documentation."
   },
   "whitelistPrompt":{
-    "message":"Renseignez ici votre liste d'hôtes à autoriser. Un nom d'hôte par ligne. Les noms d'hôte invalides seront ignorés et vous n'en serez pas averti(e).",
+    "message":"La liste blanche indique à uBlock Origin sur quels sites Web il ne doit pas opérer de filtrage. Renseignez une exception par ligne. Toute entrée invalide sera ignorée et vous n'en serez pas averti(e).",
     "description":"English: An overview of the content of the dashboard's Whitelist pane."
   },
   "whitelistImport":{

diff --git a/src/_locales/nb/messages.json b/src/_locales/nb/messages.json
@@ -40,7 +40,7 @@
     "description":"appears as tab name in dashboard"
   },
   "advancedSettingsPageName":{
-    "message":"Advanced settings",
+    "message":"Avanserte innstillinger",
     "description":"Title for the advanced settings page"
   },
   "popupPowerSwitchInfo":{
@@ -212,7 +212,7 @@
     "description":""
   },
   "settingsAdvancedUserSettings":{
-    "message":"advanced settings",
+    "message":"Avanserte innstillinger",
     "description":"For the tooltip of a link which gives access to advanced settings"
   },
   "settingsPrefetchingDisabledPrompt":{
@@ -424,7 +424,7 @@
     "description":"English: dynamic rule syntax and full documentation."
   },
   "whitelistPrompt":{
-    "message":"Din liste over vertsnavn hvor uBlock₀ blir deaktivert. Én oppføring per linje. Ugyldige vertsnavn blir stille ignorert.",
+    "message":"Hvitelistedirektivene bestemmer hvilke nettsider uBlock Origin ikke skal være aktiv på. Én oppføring per linje. Ugyldige direktiver blir stille ignorert og kommentert ut.",
     "description":"English: An overview of the content of the dashboard's Whitelist pane."
   },
   "whitelistImport":{
@@ -680,15 +680,15 @@
     "description":"used as a prompt for the user to provide a custom device name"
   },
   "advancedSettingsWarning":{
-    "message":"Warning! Change these advanced settings at your own risk.",
+    "message":"Advarsel! Endringer av de avanserte innstillingene skjer på eget ansvar.",
     "description":"A warning to users at the top of 'Advanced settings' page"
   },
   "genericSubmit":{
     "message":"Send",
     "description":"for generic 'Submit' buttons"
   },
   "genericApplyChanges":{
-    "message":"Apply changes",
+    "message":"Bruk endringer",
     "description":"for generic 'Apply changes' buttons"
   },
   "genericRevert":{

diff --git a/src/advanced-settings.html b/src/advanced-settings.html
@@ -10,7 +10,7 @@
 </head>
 
 <body>
-<p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-user-features" target="_blank">&#xf05a;</a>
+<p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-settings" target="_blank">&#xf05a;</a>
 <p>
     <button id="advancedSettingsApply" class="custom important" type="button" disabled="true" data-i18n="genericApplyChanges"></button>&ensp;
 <p><textarea id="advancedSettings" dir="auto" spellcheck="false"></textarea>