Merge branch 'master' of github.com:gorhill/uBlock into nextdev

gorhill · Jan 8, 2019 · 407aa68 · 407aa68
2 parents 64bea27 + 8a616bc
commit 407aa68
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 69 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -126,7 +126,6 @@
 			"https://easylist.to/easylist/easylist.txt",
 			"https://secure.fanboy.co.nz/easylist.txt",
 			"https://easylist-downloads.adblockplus.org/easylist.txt",
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/thirdparties/easylist-downloads.adblockplus.org/easylist.txt",
 			"assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt"
 		],
 		"supportURL": "https://forums.lanik.us/"
@@ -148,7 +147,6 @@
 			"https://easylist.to/easylist/easyprivacy.txt",
 			"https://secure.fanboy.co.nz/easyprivacy.txt",
 			"https://easylist-downloads.adblockplus.org/easyprivacy.txt",
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt",
 			"assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt"
 		],
 		"supportURL": "https://forums.lanik.us/"
@@ -225,8 +223,7 @@
 		"title": "Fanboy’s Annoyance List",
 		"contentURL": [
 			"https://easylist.to/easylist/fanboy-annoyance.txt",
-			"https://fanboy.co.nz/fanboy-annoyance.txt",
-			"https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt"
+			"https://fanboy.co.nz/fanboy-annoyance.txt"
 		],
 		"supportURL": "https://forums.lanik.us/"
 	},
@@ -245,8 +242,7 @@
 		"title": "Fanboy’s Social Blocking List",
 		"contentURL": [
 			"https://easylist.to/easylist/fanboy-social.txt",
-			"https://fanboy.co.nz/fanboy-social.txt",
-			"https://easylist-downloads.adblockplus.org/fanboy-social.txt"
+			"https://fanboy.co.nz/fanboy-social.txt"
 		],
 		"supportURL": "https://forums.lanik.us/"
 	},
@@ -411,10 +407,7 @@
 		"off": true,
 		"title": "IDN, MYS: ABPindo",
 		"lang": "id ms",
-		"contentURL": [
-			"https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt",
-			"https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt"
-		],
+		"contentURL": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt",
 		"supportURL": "https://github.com/ABPindo/indonesianadblockrules"
 	},
 	"IRN-0": {

diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.17.7.1
+1.17.7.2
diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json
@@ -544,15 +544,15 @@
     "description": "Appears in the logger's tab selector"
   },
   "loggerReloadTip": {
-    "message": "Reload the tab content",
+    "message": "إعادة تحميل علامة التبويب",
     "description": "Tooltip for the reload button in the logger page"
   },
   "loggerDomInspectorTip": {
-    "message": "Toggle the DOM inspector",
+    "message": "تفعيل أو تعطيل مستكشف Dom",
     "description": "Tooltip for the DOM inspector button in the logger page"
   },
   "loggerPopupPanelTip": {
-    "message": "Toggle the popup panel",
+    "message": "تفعيل أو تعطيل اللوحة المنبثقة",
     "description": "Tooltip for the popup panel button in the logger page"
   },
   "loggerInfoTip": {
@@ -592,19 +592,19 @@
     "description": "A keyword in the built-in row filtering expression: all items corresponding to uBO doing something (blocked, allowed, redirected, etc.)"
   },
   "loggerRowFiltererBuiltinBlocked": {
-    "message": "blocked",
+    "message": "الحظر",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltinAllowed": {
-    "message": "allowed",
+    "message": "السماح",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin1p": {
-    "message": "1st-party",
+    "message": "الطرف الأول",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin3p": {
-    "message": "3rd-party",
+    "message": "الطرف الثالث",
     "description": "A keyword in the built-in row filtering expression"
   },
   "logMaxEntriesTip": {

diff --git a/src/_locales/ca/messages.json b/src/_locales/ca/messages.json
@@ -544,7 +544,7 @@
     "description": "Appears in the logger's tab selector"
   },
   "loggerReloadTip": {
-    "message": "Torna a carregar el contingut de la pestanya",
+    "message": "Refresca la pestanya",
     "description": "Tooltip for the reload button in the logger page"
   },
   "loggerDomInspectorTip": {

diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json
@@ -544,67 +544,67 @@
     "description": "Appears in the logger's tab selector"
   },
   "loggerReloadTip": {
-    "message": "Reload the tab content",
+    "message": "Ponovno učitaj sadržaj kartice",
     "description": "Tooltip for the reload button in the logger page"
   },
   "loggerDomInspectorTip": {
-    "message": "Toggle the DOM inspector",
+    "message": "Uključi\/Isključi DOM inspektor",
     "description": "Tooltip for the DOM inspector button in the logger page"
   },
   "loggerPopupPanelTip": {
-    "message": "Toggle the popup panel",
+    "message": "Uključi\/Isključi panel sa skočnim prozorima",
     "description": "Tooltip for the popup panel button in the logger page"
   },
   "loggerInfoTip": {
-    "message": "uBlock Origin wiki: The logger",
+    "message": "uBlock Origin wiki: Zabilješke",
     "description": "Tooltip for the top-right info label in the logger page"
   },
   "loggerClearTip": {
-    "message": "Clear logger",
+    "message": "Očisti zabilješke",
     "description": "Tooltip for the eraser in the logger page; used to blank the content of the logger"
   },
   "loggerPauseTip": {
-    "message": "Pause logger (discard all incoming data)",
+    "message": "Pauziraj zabilješke (odbaci sve dolazne podatke)",
     "description": "Tooltip for the pause button in the logger page"
   },
   "loggerUnpauseTip": {
-    "message": "Unpause logger",
+    "message": "Uključite zabilješke",
     "description": "Tooltip for the play button in the logger page"
   },
   "loggerRowFiltererButtonTip": {
-    "message": "Toggle logger filtering",
+    "message": "Uključi\/Isključi filtriranje zabilješki",
     "description": "Tooltip for the row filterer button in the logger page"
   },
   "logFilterPrompt": {
     "message": "filtrirajte zabilješke",
     "description": "Placeholder string for logger output filtering input field"
   },
   "loggerRowFiltererBuiltinTip": {
-    "message": "Logger filtering options",
+    "message": "Postavke filtiriranja zabilješki",
     "description": "Tooltip for the button to bring up logger output filtering options"
   },
   "loggerRowFiltererBuiltinNot": {
-    "message": "Not",
+    "message": "Ne",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltinEventful": {
-    "message": "eventful",
+    "message": "sadržajno",
     "description": "A keyword in the built-in row filtering expression: all items corresponding to uBO doing something (blocked, allowed, redirected, etc.)"
   },
   "loggerRowFiltererBuiltinBlocked": {
-    "message": "blocked",
+    "message": "blokirano",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltinAllowed": {
-    "message": "allowed",
+    "message": "dopušteno",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin1p": {
-    "message": "1st-party",
+    "message": "Prve strane",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin3p": {
-    "message": "3rd-party",
+    "message": "Treće strane",
     "description": "A keyword in the built-in row filtering expression"
   },
   "logMaxEntriesTip": {
@@ -696,7 +696,7 @@
     "description": "English: Contributors"
   },
   "aboutDependencies": {
-    "message": "External dependencies (GPLv3-compatible):",
+    "message": "Vanjski korišteni programi (GPLv3-kompatiblini):",
     "description": "Shown in the About pane"
   },
   "aboutBackupDataButton": {
@@ -856,7 +856,7 @@
     "description": "Placeholder string for input field used to capture a keyboard shortcut"
   },
   "genericMergeViewScrollLock": {
-    "message": "Toggle locked scrolling",
+    "message": "Uključi\/Isključi zaključano pomicanje",
     "description": "Tooltip for the button used to lock scrolling between the views in the 'My rules' pane"
   },
   "dummy": {

diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json
@@ -124,7 +124,7 @@
     "description": "Tooltip for the no-large-media per-site switch"
   },
   "popupTipNoCosmeticFiltering": {
-    "message": "Alihkan penyaringan tampilan untuk situs ini",
+    "message": "Aktif\/Nonaktifkan filter tampilan untuk situs ini",
     "description": "Tooltip for the no-cosmetic-filtering per-site switch"
   },
   "popupTipNoCosmeticFiltering1": {
@@ -164,11 +164,11 @@
     "description": "Tooltip when hovering the top-most cell of the local-rules column."
   },
   "popupTipSaveRules": {
-    "message": "Klik untuk membuat ubahan Anda permanen.",
+    "message": "Klik untuk membuat ubahan anda permanen.",
     "description": "Tooltip when hovering over the padlock in the dynamic filtering pane."
   },
   "popupTipRevertRules": {
-    "message": "Klik untuk membatalkan ubahan Anda.",
+    "message": "Klik untuk membatalkan ubahan anda.",
     "description": "Tooltip when hovering over the eraser in the dynamic filtering pane."
   },
   "popupAnyRulePrompt": {
@@ -296,7 +296,7 @@
     "description": ""
   },
   "settingsNoCosmeticFilteringPrompt": {
-    "message": "Nonfungsikan filter tampilan",
+    "message": "Nonaktifkan filter tampilan",
     "description": ""
   },
   "settingsNoLargeMediaPrompt": {
@@ -336,7 +336,7 @@
     "description": "Appears aside each filter list in the _3rd-party filters_ pane"
   },
   "3pAutoUpdatePrompt1": {
-    "message": "Pembaruan otomatis daftar filter.",
+    "message": "Otomatis perbarui daftar filter",
     "description": "A checkbox in the _3rd-party filters_ pane"
   },
   "3pUpdateNow": {
@@ -348,7 +348,7 @@
     "description": "A button in the in the _3rd-party filters_ pane"
   },
   "3pParseAllABPHideFiltersPrompt1": {
-    "message": "Uraikan dan paksa jalankan filter tampilan.",
+    "message": "Urai dan paksa terapkan filter tampilan",
     "description": "English: Parse and enforce Adblock+ element hiding filters."
   },
   "3pParseAllABPHideFiltersInfo": {
@@ -544,43 +544,43 @@
     "description": "Appears in the logger's tab selector"
   },
   "loggerReloadTip": {
-    "message": "Reload the tab content",
+    "message": "Muat ulang konten tab",
     "description": "Tooltip for the reload button in the logger page"
   },
   "loggerDomInspectorTip": {
-    "message": "Toggle the DOM inspector",
+    "message": "Aktif\/Nonaktifkan inspeksi DOM",
     "description": "Tooltip for the DOM inspector button in the logger page"
   },
   "loggerPopupPanelTip": {
-    "message": "Toggle the popup panel",
+    "message": "Aktif\/Nonaktifkan panel popup",
     "description": "Tooltip for the popup panel button in the logger page"
   },
   "loggerInfoTip": {
-    "message": "uBlock Origin wiki: The logger",
+    "message": "uBlock Origin wiki: Pencatat log",
     "description": "Tooltip for the top-right info label in the logger page"
   },
   "loggerClearTip": {
-    "message": "Clear logger",
+    "message": "Kosongkan pencatat log",
     "description": "Tooltip for the eraser in the logger page; used to blank the content of the logger"
   },
   "loggerPauseTip": {
-    "message": "Pause logger (discard all incoming data)",
+    "message": "Jeda pencatat log (buang semua data yang masuk)",
     "description": "Tooltip for the pause button in the logger page"
   },
   "loggerUnpauseTip": {
-    "message": "Unpause logger",
+    "message": "Lanjutkan pencatat log",
     "description": "Tooltip for the play button in the logger page"
   },
   "loggerRowFiltererButtonTip": {
-    "message": "Toggle logger filtering",
+    "message": "Aktif\/Nonaktifkan filter pencatat log",
     "description": "Tooltip for the row filterer button in the logger page"
   },
   "logFilterPrompt": {
-    "message": "saring entri catatan",
+    "message": "filter konten pencatat log",
     "description": "Placeholder string for logger output filtering input field"
   },
   "loggerRowFiltererBuiltinTip": {
-    "message": "Logger filtering options",
+    "message": "Opsi filter pencatat log",
     "description": "Tooltip for the button to bring up logger output filtering options"
   },
   "loggerRowFiltererBuiltinNot": {
@@ -592,23 +592,23 @@
     "description": "A keyword in the built-in row filtering expression: all items corresponding to uBO doing something (blocked, allowed, redirected, etc.)"
   },
   "loggerRowFiltererBuiltinBlocked": {
-    "message": "blocked",
+    "message": "diblokir",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltinAllowed": {
-    "message": "allowed",
+    "message": "diizinkan",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin1p": {
-    "message": "1st-party",
+    "message": "Pihak ke-1",
     "description": "A keyword in the built-in row filtering expression"
   },
   "loggerRowFiltererBuiltin3p": {
-    "message": "3rd-party",
+    "message": "Pihak ke-3",
     "description": "A keyword in the built-in row filtering expression"
   },
   "logMaxEntriesTip": {
-    "message": "Jumlah maximum entri catatan",
+    "message": "Jumlah maksimum entri pencatat log",
     "description": "Tooltip informaing that the input field is to set the maximum number of entries in the log"
   },
   "loggerURLFilteringContextLabel": {
@@ -620,11 +620,11 @@
     "description": "Label for the type selector"
   },
   "loggerURLFilteringHeader": {
-    "message": "Penyaring URL Dinamis",
+    "message": "Filter URL dinamis",
     "description": "Small header to identify the dynamic URL filtering section"
   },
   "loggerStaticFilteringHeader": {
-    "message": "Penyaringan statis",
+    "message": "Filter statis",
     "description": "Small header to identify the static filtering section"
   },
   "loggerStaticFilteringSentence": {
@@ -696,7 +696,7 @@
     "description": "English: Contributors"
   },
   "aboutDependencies": {
-    "message": "Ketergantungan eksternal (GPLv3-compatible):",
+    "message": "Dependensi eksternal (kompatibel GPLv3):",
     "description": "Shown in the About pane"
   },
   "aboutBackupDataButton": {
@@ -764,7 +764,7 @@
     "description": "Firefox\/Fennec-specific: Show Dashboard"
   },
   "showNetworkLogButton": {
-    "message": "Tampilkan Pencatat",
+    "message": "Tampilkan Pencatat Log",
     "description": "Firefox\/Fennec-specific: Show Logger"
   },
   "fennecMenuItemBlockingOff": {
@@ -828,7 +828,7 @@
     "description": "used as a prompt for the user to provide a custom device name"
   },
   "advancedSettingsWarning": {
-    "message": "Peringatan! Ubah pengaturan lanjutan berikut dengan resiko Anda sendiri.",
+    "message": "Peringatan! Ubah pengaturan lanjutan berikut dengan resiko anda sendiri.",
     "description": "A warning to users at the top of 'Advanced settings' page"
   },
   "genericSubmit": {
@@ -856,7 +856,7 @@
     "description": "Placeholder string for input field used to capture a keyboard shortcut"
   },
   "genericMergeViewScrollLock": {
-    "message": "Toggle locked scrolling",
+    "message": "Aktif\/Nonaktifkan bilah gulir",
     "description": "Tooltip for the button used to lock scrolling between the views in the 'My rules' pane"
   },
   "dummy": {