Merge pull request #186 from NanoAdblocker/nano-next

Sync 1.16.12
NanoAdblocker · Jun 29, 2018 · 41722aa · 41722aa
2 parents af8554a + caecec7
commit 41722aa
Show file tree

Hide file tree

Showing 14 changed files with 198 additions and 188 deletions.
diff --git a/dist/README.md.old b/dist/README.md.old
@@ -20,21 +20,21 @@ Remember that you have to update manually also. For some users, updating manuall
 - You can update when **you** want
 - If ever a new version sucks, you can easily just re-install the previous one
 
-### Firefox webext
+### Firefox
 
 Compatible with Firefox 52 and beyond. 
 
 #### For stable release version
 
 This works only if you set `xpinstall.signatures.required` to `false` in `about:config`.<sup>[see "Add-on signing in Firefox"](https://support.mozilla.org/en-US/kb/add-on-signing-in-firefox)</sup>
 
-- Download `ublock0.webext.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
+- Download `ublock0.firefox.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
     - Right-click and choose _"Save As..."_.
-- Drag and drop the previously downloaded `ublock0.webext.xpi` into Firefox
+- Drag and drop the previously downloaded `ublock0.firefox.xpi` into Firefox
 
 #### For beta version
 
-- Click on `ublock0.webext.signed.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
+- Click on `ublock0.firefox.signed.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
 
 #### Location of uBO settings
 
@@ -61,13 +61,18 @@ On Windows, the settings are saved in a SQlite file located at `%APPDATA%\Mozill
 ### Build instructions (for developers)
 
 - Clone [uBlock](https://github.com/gorhill/uBlock) and [uAssets](https://github.com/uBlockOrigin/uAssets) repositories in the same parent directory
+    - `git clone https://github.com/gorhill/uBlock.git`
+    - `git clone https://github.com/uBlockOrigin/uAssets.git`
 - Set path to uBlock: `cd uBlock`
-- Optional: Select the version to build: `git checkout <tag>`
+- The official version of uBO is in the `master` branch
+    - `git checkout master`
 - Build the plugin:
     - Chromium: `./tools/make-chromium.sh`
-    - Firefox webext: `./tools/make-webext.sh all`
-    - Firefox legacy: `./tools/make-firefox.sh all`
+    - Firefox webext: `./tools/make-firefox.sh all`
+    - Firefox legacy:
+        - `git checkout firefox-legacy`
+        - `./tools/make-firefox-legacy.sh all`
 - Load the result of the build into your browser:
     - Chromium: load the unpacked extension folder `/uBlock/dist/build/uBlock0.chromium/` in Chromium to use the extension.
-    - Firefox: drag-and-drop `/uBlock/dist/build/uBlock0.firefox.xpi` or `/uBlock/dist/build/uBlock0.webext.xpi` into Firefox.
-
+    - Firefox: drag-and-drop `/uBlock/dist/build/uBlock0.firefox.xpi` or `/uBlock/dist/build/uBlock0.firefox-legacy.xpi` into Firefox.
+
diff --git a/dist/description/description-zh_CN.txt b/dist/description/description-zh_CN.txt
@@ -1,22 +1,22 @@
-一款高效的请求过滤工具：占用极低的内存和CPU，和其他常见的过滤工具相比，它能够加载并执行上千条过滤规则。
+一款高效的请求过滤工具：占用极低的内存和 CPU，与其他常见的过滤器相比，它能够多加载并执行上千条过滤规则。
 
-效率概述说明： 
+带图表的效率概述说明： 
 https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 
-用法：点击弹出窗口中的电源按钮，uBlock 将对当前网页永久禁用/启用过滤功能。 它只控制当前网页的请求过滤，而不是一个全局开关。
+用法：点击弹出窗口中的电源按钮，uBlock 将对当前网站永久禁用/启用过滤功能。 它仅应用于当前网站，而非全局性的开关。
 
 ***
 
-它很灵活，它不只是一个广告拦截工具，它还可以从 hosts 文件里读取和创建过滤规则。
+它很灵活，不只是一个“广告拦截器”：它还能从 hosts 文件中读取、创建过滤规则。
 
-初始默认加载和执行下列过滤规则列表：
+初始默认加载和执行下列过滤规则：
 
 - EasyList
 - Peter Lowe’s Ad server list
 - EasyPrivacy
 - Malware domains
 
-这里还有更多的规则列表供你选择：
+这里还有更多规则列表可供您选择：
 
 - Fanboy’s Enhanced Tracking List
 - Dan Pollock’s hosts file
@@ -25,23 +25,23 @@ https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
 - Spam404
 - 等等
 
-当然，启用越多的过滤规则就会产生越高的内存占用。 然而，即使再添加两个 Fanboy 规则列表，比如 hpHosts’s Ad 和 tracking servers，uBlock 的内存占用依然比其他常见的过滤工具要低得多。
+当然，启用的过滤规则越多，占用的内存也就越高。 然而，即使再添加 Fanboy 的两个额外规则列表与 hpHosts’s Ad and tracking servers，uBlock 的内存占用依然比其他流行的过滤器更低。
 
-另外请注意，启用一些额外的规则列表可能会增加网页显示错误的可能性 —— 尤其是那些通常被用作 hosts 文件的列表。
+另外，请注意，一些额外的规则列表可能会导致网站出现错误 —— 尤其是那些一般被作为 hosts 文件使用的列表。
 
 ***
 
-没有这些过滤规则列表，这个扩展就没有了意义。 所以如果你真的想做点贡献，想想那些努力维护过滤规则的人们，是他们让所有人能够免费使用这一切。
+没有这些过滤规则列表，这个扩展就没有了意义。 所以如果你真的想做点贡献，想想那些维护过滤规则的人们，是他们让所有人能够免费使用这一切变得可能。
 
 ***
 
-免费。
-遵从 GPLv3 公共许可协议开源。
-一切为了用户。
+自由并且免费。
+使用 GPLv3 公共许可协议开源。
+来自用户，只为用户。
 
-贡献者 @ Github:
+Github 上的贡献者们：
 https://github.com/gorhill/uBlock/graphs/contributors
-贡献者 @ Crowdin:
+Crowdin 上的贡献者们：
 https://crowdin.net/project/ublock
 
 ***

diff --git a/dist/description/description-zh_TW.txt b/dist/description/description-zh_TW.txt
@@ -1,21 +1,21 @@
-一個高效率的阻擋器：使用不多的記憶體以及 CPU 資源，但卻能比市面上其他熱門的阻擋器，載入並執行數以千計的過濾規則。
+一個高效率的阻擋器：使用不多的記憶體以及 CPU 資源，卻能比其他熱門的阻擋器多載入並執行數以千計的過濾規則。
 
-效能比較的概述圖例：https://github.com/gorhill/uBlock/wiki/%C2%B5Block-vs.-ABP:-efficiency-compared
+效能比較示意圖：https://github.com/gorhill/uBlock/wiki/%C2%B5Block-vs.-ABP:-efficiency-compared
 
-用法：在彈出式選單中的大電源按鈕，是用來設定是否在目前的網站永久的禁用/啟用 uBlock。 此按鈕僅於目前所在的網站有效，它並非是此擴展套件的總開關按鈕。
+用法：在彈出式選單中的大電源按鈕，是用來設定是否在目前的網站永久的禁用/啟用 uBlock₀ 。 此按鈕僅於目前所在的網站有效，它並非是此擴展套件的總開關按鈕。
 
 ***
 
-彈性化，這並不僅僅是一個 "廣告阻擋器"：它甚至能從 host 檔案中讀取並建立過濾規則。
+非常彈性：這不僅是「廣告阻擋器」，甚至能從 host 檔案中讀取並建立過濾規則。
 
-下列的過濾規則列表，是預設被載入及啟用的：
+首次安裝後，預設就會載入套用下列過濾規則：
 
 - EasyList
 - Peter Lowe’s Ad server list
 - EasyPrivacy
 - Malware domains
 
-您可以依照您的意願選擇更多的過濾規則列表：
+您可以自由選擇更多過濾規則：
 
 - Fanboy’s Enhanced Tracking List
 - Dan Pollock’s hosts file
@@ -24,26 +24,26 @@
 - Spam404
 - 以及其他更多
 
-當啟用更多的過濾規則，記憶體資源也理所當然地使用越多。 但哪怕加入了 Fanboy 的 2 個額外的過濾規則列表，hpHosts’s Ad and tracking servers 過濾規則列表，uBlock 仍比市面上其他熱門的阻擋器使用更少的記憶體資源。
+當然，啟用更多的過濾規則的話，就會使用更多記憶體資源。 但哪怕加入了 Fanboy 的 2 個額外的過濾規則列表，hpHosts’s Ad and tracking servers 過濾規則列表，uBlock 仍比市面上其他熱門的阻擋器使用更少的記憶體資源。
 
-另外，請注意，當啟用部份額外的過濾規則列表，將有可能增加網站排版破損的機率 -- 尤其是那些通常被用作 host 檔案的過濾規則列表。
+另外，請注意，某些過濾規則載入後可能造成網站版面出現問題 -- 尤其是通常作為 host 檔案的過濾規則。
 
 ***
 
-若是沒有這些預置的過濾規則列表，這個過展套件本身並沒有什麼。 所以當您真的想要貢獻些什麼的時候，請想想那些，您正在使用的，被人們努力維護並免費提供給所有人的過濾規則列表。
+若沒有這些預設的過濾規則，這個擴充套件本身沒什麼用， 所以若您真的想要貢獻些什麼的話，請想想那些人們花時間努力維護並免費提供給您與其他人使用的過濾規則。
 
 ***
 
-免費。
-以公眾授權開放原始程式碼（GPLv3）
+免費且自由。
+以公眾授權開放程式原始碼（GPLv3）。
 獻給所有人。
 
 貢獻者 @ Github: https://github.com/gorhill/uBlock/graphs/contributors
 貢獻者 @ Crowdin: https://crowdin.net/project/ublock
 
 ***
 
-當您在做評論時，請在您的心中記住一件事，此擴展套件目前僅是一個相當初期的版本。
+當您做評論時，請記住，此擴展套件目前仍是相當初期的版本。
 
 專案更新日誌：
 https://github.com/gorhill/uBlock/releases
diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
@@ -3,10 +3,10 @@
   "[email protected]": {
    "updates": [
     {
-     "version": "1.16.9.100",
+     "version": "1.16.11.102",
      "applications": { "gecko": { "strict_min_version": "52" } },
-     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.16.9rc0",
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.16.9rc0/uBlock0.firefox.signed.xpi"
+     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.16.11rc2",
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.16.11rc2/uBlock0.firefox.signed.xpi"
     }
    ]
   }

diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.16.11.100
+1.16.12
diff --git a/src/_locales/bg/messages.json b/src/_locales/bg/messages.json
@@ -420,7 +420,7 @@
     "description": "English: Export"
   },
   "1pExportFilename": {
-    "message": "моите-ublock-статични-филтри_{{datetime}}.txt",
+    "message": "ublock-мои-филтри_{{datetime}}.txt",
     "description": "English: my-ublock-static-filters_{{datetime}}.txt"
   },
   "1pApplyChanges": {
@@ -464,7 +464,7 @@
     "description": ""
   },
   "rulesDefaultFileName": {
-    "message": "моите-ublock-динамични-правила_{{datetime}}.txt",
+    "message": "ublock-мои-правила_{{datetime}}.txt",
     "description": "default file name to use"
   },
   "rulesHint": {
@@ -488,7 +488,7 @@
     "description": "English: Export"
   },
   "whitelistExportFilename": {
-    "message": "моите-ublock-изключения_{{datetime}}.txt",
+    "message": "ublock-изключения_{{datetime}}.txt",
     "description": "English: my-ublock-whitelist_{{datetime}}.txt"
   },
   "whitelistApply": {
@@ -616,7 +616,7 @@
     "description": "Text for button to create a backup of all settings"
   },
   "aboutBackupFilename": {
-    "message": "моето-ublock-резервно-копие_{{datetime}}.txt",
+    "message": "ublock-всички-настройки_{{datetime}}.txt",
     "description": "English: my-ublock-backup_{{datetime}}.txt"
   },
   "aboutRestoreDataButton": {

diff --git a/src/_locales/ka/messages.json b/src/_locales/ka/messages.json
@@ -608,7 +608,7 @@
     "description": "English: Source code (GPLv3)"
   },
   "aboutContributors": {
-    "message": "დამხმარეები",
+    "message": "მოხალისეები",
     "description": "English: Contributors"
   },
   "aboutBackupDataButton": {
@@ -740,7 +740,7 @@
     "description": "used as a prompt for the user to provide a custom device name"
   },
   "advancedSettingsWarning": {
-    "message": "გაფრთხილება! დამატებითი პარამეტრებს ცვლილების შედეგებზე, თავად ხართ პასუხისმგებელი.",
+    "message": "გაფრთხილება! დამატებითი პარამეტრების ცვლილების შედეგებზე, თავად იქნებით პასუხისმგებელი.",
     "description": "A warning to users at the top of 'Advanced settings' page"
   },
   "genericSubmit": {

diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json
@@ -352,7 +352,7 @@
     "description": "English: Apply changes"
   },
   "3pGroupDefault": {
-    "message": "uBlock₀ 제공",
+    "message": "Ublock₀ 제공",
     "description": "Header for the uBlock filters section in 'Filter lists pane'"
   },
   "3pGroupAds": {
@@ -384,7 +384,7 @@
     "description": "English: Custom"
   },
   "3pImport": {
-    "message": "직접 추가",
+    "message": "불러오기..",
     "description": "The label for the checkbox used to import external filter lists"
   },
   "3pExternalListsHint": {

diff --git a/src/_locales/lv/messages.json b/src/_locales/lv/messages.json
@@ -48,11 +48,11 @@
     "description": "English: Click: disable\/enable uBlock₀ for this site.\n\nCtrl+click: disable uBlock₀ only on this page."
   },
   "popupPowerSwitchInfo1": {
-    "message": "Click to disable uBlock₀ for this site.\n\nCtrl+click to disable uBlock₀ only on this page.",
+    "message": "Noklikšķiniet, lai atslēgtu uBlock₀ šajā vietnē.\n\nCtrl+klikšķis, lai atslēgtu uBlock₀ tikai šajā lapā.",
     "description": "Message to be read by screen readers"
   },
   "popupPowerSwitchInfo2": {
-    "message": "Click to enable uBlock₀ for this site.",
+    "message": "Noklikšķiniet, lai ieslēgtu uBlock₀ šajā vietnē.",
     "description": "Message to be read by screen readers"
   },
   "popupBlockedRequestPrompt": {
@@ -80,7 +80,7 @@
     "description": "English: Click to open the dashboard"
   },
   "popupTipZapper": {
-    "message": "Enter element zapper mode",
+    "message": "Ieiet elementa dzēšanas režīmā",
     "description": "Tooltip for the element-zapper icon in the popup panel"
   },
   "popupTipPicker": {
@@ -96,47 +96,47 @@
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups1": {
-    "message": "Click to block all popups on this site",
+    "message": "Noklikšķiniet, lai bloķētu uznirstošos logus šajā vietnē",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoPopups2": {
-    "message": "Click to no longer block all popups on this site",
+    "message": "Noklikšķiniet, lai nebloķētu uznirstošos logus šajā vietnē",
     "description": "Tooltip for the no-popups per-site switch"
   },
   "popupTipNoLargeMedia": {
     "message": "Pārslēgt lielu multivides elementu bloķēšanu šajā vietnē",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia1": {
-    "message": "Click to block large media elements on this site",
+    "message": "Noklikšķiniet, lai bloķētu lielus multivides elementus šajā vietnē",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoLargeMedia2": {
-    "message": "Click to no longer block large media elements on this site",
+    "message": "Noklikšķiniet, lai nebloķētu lielus multivides elementus šajā vietnē",
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoCosmeticFiltering": {
     "message": "Pārslēgt kosmētisko filtrēšanu šajā vietnē",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering1": {
-    "message": "Click to disable cosmetic filtering on this site",
+    "message": "Noklikšķiniet, lai atslēgtu kosmētisko filtrēšanu šajā vietnē",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering2": {
-    "message": "Click to enable cosmetic filtering on this site",
+    "message": "Noklikšķiniet, lai ieslēgtu kosmētisko filtrēšanu šajā vietnē",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoRemoteFonts": {
     "message": "Pārslēgt ārējo fontu bloķēšanu šajā vietnē",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts1": {
-    "message": "Click to block remote fonts on this site",
+    "message": "Noklikšķiniet, lai bloķētu ārējos fontus šajā vietnē",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipNoRemoteFonts2": {
-    "message": "Click to no longer block remote fonts on this site",
+    "message": "Noklikšķiniet, lai nebloķētu ārējos fontus šajā vietnē",
     "description": "Tooltip for the no-remote-fonts per-site switch"
   },
   "popupTipGlobalRules": {
@@ -340,7 +340,7 @@
     "description": "This will cause uBO to ignore all generic cosmetic filters."
   },
   "3pIgnoreGenericCosmeticFiltersInfo": {
-    "message": "<p>Generic cosmetic filters are those cosmetic filters which are meant to apply on all web sites.<p>Though handled efficiently by uBlock₀, generic cosmetic filters may still contribute measurable memory and CPU overhead on some web pages, especially for large and long-lived ones.<p>Enabling this option will eliminate the memory and CPU overhead added to web pages as a result of handling generic cosmetic filters, and also lower the memory footprint of uBlock₀ itself.<p>It is recommended to enable this option on less powerful devices.",
+    "message": "<p>Vispārīgie kosmētikas filtri ir kosmētikas filtri, kurus paredzēts piemērot visās tīmekļvietnēs.<p>Lai gan uBlock ₀ darbojas efektīvi, vispārīgie kosmētikas filtri dažās tīmekļa lapās var ievērojami noslogot atmiņu un centrālo procesoru.<p>Šīs opcijas izmantošana samazinās vispārīgo kosmētikas filtru izmantotās atmiņas un procesora noslodzi kā arī samazinās paša uBlock₀ izmantoto atmiņu.<p>Ieteicams izmantot zemas veiktspējas ierīcēm.",
     "description": "Describes the purpose of the 'Ignore generic cosmetic filters' feature."
   },
   "3pListsOfBlockedHostsHeader": {
@@ -352,7 +352,7 @@
     "description": "English: Apply changes"
   },
   "3pGroupDefault": {
-    "message": "Built-in",
+    "message": "Iebūvētie",
     "description": "Header for the uBlock filters section in 'Filter lists pane'"
   },
   "3pGroupAds": {
@@ -368,7 +368,7 @@
     "description": "English: Malware domains"
   },
   "3pGroupAnnoyances": {
-    "message": "Annoyances",
+    "message": "Traucējoši elementi",
     "description": "The header identifying the filter lists in the category 'annoyances'"
   },
   "3pGroupMultipurpose": {
@@ -384,7 +384,7 @@
     "description": "English: Custom"
   },
   "3pImport": {
-    "message": "Import...",
+    "message": "Importēt...",
     "description": "The label for the checkbox used to import external filter lists"
   },
   "3pExternalListsHint": {
@@ -600,7 +600,7 @@
     "description": "A link for where to get support"
   },
   "aboutIssues": {
-    "message": "Issue tracker",
+    "message": "Zināmās kļūdas",
     "description": "Text for a link to official issue tracker"
   },
   "aboutCode": {
@@ -740,7 +740,7 @@
     "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": "Brīdinājums! Mainiet šos iestatījumus uz savu atbildību.",
     "description": "A warning to users at the top of 'Advanced settings' page"
   },
   "genericSubmit": {