Skip to content

Commit fab366b

Browse files
committed
Merge tag '1.9.17rc0'
2 parents 85d7681 + 1e25fc7 commit fab366b

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

assets/ublock/filter-lists.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
"supportURL": "http://www.malwaredomains.com/"
232232
},
233233
"pgl.yoyo.org/as/serverlist": {
234-
"title": "Peter Lowe’s Ad server list",
234+
"title": "Peter Lowe’s Ad and tracking server list",
235235
"group": "multipurpose",
236236
"homeURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
237237
"supportURL": "https://pgl.yoyo.org/adservers/"

dist/description/description-ms.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ Kecekapan yang digambarkan:
44
https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared
55
(Bahasa English)
66

7-
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.
7+
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.
88

99
***
1010

1111
Flexible, it's more than an "ad blocker": it can also read and create filters from hosts files.
1212

13-
Out of the box, these lists of filters are loaded and enforced:
13+
Senarai penapis yang telah dimuatkan and dikuatkuasakan adalah yang berikutnya:
1414

1515
- EasyList
1616
- Peter Lowe’s Ad server list
1717
- EasyPrivacy
1818
- Malware domains
1919

20-
More lists are available for you to select if you wish:
20+
Banyak lagi senarai penapis yang boleh anda pilih seperti:
2121

2222
- Fanboy’s Enhanced Tracking List
2323
- Dan Pollock’s hosts file
2424
- hpHosts’s Ad and tracking servers
2525
- MVPS HOSTS
2626
- Spam404
27-
- And many others
27+
- dan banyak lagi
2828

2929
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.
3030

platform/chromium/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33

44
"name": "uBlock Origin",
5-
"version": "1.9.17.10",
5+
"version": "1.9.17.100",
66

77
"default_locale": "en",
88
"description": "__MSG_extShortDesc__",

platform/edge/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33

44
"name": "uBlock Origin",
5-
"version": "1.9.17.10",
5+
"version": "1.9.17.100",
66

77
"default_locale": "en",
88
"description": "__MSG_extShortDesc__",

src/_locales/eo/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@
540540
"description":"English: project' wiki on Github"
541541
},
542542
"aboutSupport":{
543-
"message":"Support",
543+
"message":"Helpo",
544544
"description":"A link for where to get support"
545545
},
546546
"aboutCode":{
@@ -688,7 +688,7 @@
688688
"description":"for generic 'Submit' buttons"
689689
},
690690
"genericApplyChanges":{
691-
"message":"Apply changes",
691+
"message":"Apliki ŝanĝojn",
692692
"description":"for generic 'Apply changes' buttons"
693693
},
694694
"genericRevert":{

src/_locales/fa/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@
688688
"description":"for generic 'Submit' buttons"
689689
},
690690
"genericApplyChanges":{
691-
"message":"Apply changes",
691+
"message":"اعمال تغییرات",
692692
"description":"for generic 'Apply changes' buttons"
693693
},
694694
"genericRevert":{

src/_locales/fr/messages.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"description":"English: Click to open the dashboard"
7373
},
7474
"popupTipPicker":{
75-
"message":"Aller au sélecteur d'élément",
75+
"message":"Activer le sélecteur d'élément",
7676
"description":"English: Enter element picker mode"
7777
},
7878
"popupTipLog":{
@@ -212,7 +212,7 @@
212212
"description":""
213213
},
214214
"settingsAdvancedUserSettings":{
215-
"message":"paramètres avancés",
215+
"message":"Paramètres avancés",
216216
"description":"For the tooltip of a link which gives access to advanced settings"
217217
},
218218
"settingsPrefetchingDisabledPrompt":{
@@ -424,7 +424,7 @@
424424
"description":"English: dynamic rule syntax and full documentation."
425425
},
426426
"whitelistPrompt":{
427-
"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).",
427+
"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).",
428428
"description":"English: An overview of the content of the dashboard's Whitelist pane."
429429
},
430430
"whitelistImport":{

src/_locales/nb/messages.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"description":"appears as tab name in dashboard"
4141
},
4242
"advancedSettingsPageName":{
43-
"message":"Advanced settings",
43+
"message":"Avanserte innstillinger",
4444
"description":"Title for the advanced settings page"
4545
},
4646
"popupPowerSwitchInfo":{
@@ -212,7 +212,7 @@
212212
"description":""
213213
},
214214
"settingsAdvancedUserSettings":{
215-
"message":"advanced settings",
215+
"message":"Avanserte innstillinger",
216216
"description":"For the tooltip of a link which gives access to advanced settings"
217217
},
218218
"settingsPrefetchingDisabledPrompt":{
@@ -424,7 +424,7 @@
424424
"description":"English: dynamic rule syntax and full documentation."
425425
},
426426
"whitelistPrompt":{
427-
"message":"Din liste over vertsnavn hvor uBlock₀ blir deaktivert. Én oppføring per linje. Ugyldige vertsnavn blir stille ignorert.",
427+
"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.",
428428
"description":"English: An overview of the content of the dashboard's Whitelist pane."
429429
},
430430
"whitelistImport":{
@@ -680,15 +680,15 @@
680680
"description":"used as a prompt for the user to provide a custom device name"
681681
},
682682
"advancedSettingsWarning":{
683-
"message":"Warning! Change these advanced settings at your own risk.",
683+
"message":"Advarsel! Endringer av de avanserte innstillingene skjer på eget ansvar.",
684684
"description":"A warning to users at the top of 'Advanced settings' page"
685685
},
686686
"genericSubmit":{
687687
"message":"Send",
688688
"description":"for generic 'Submit' buttons"
689689
},
690690
"genericApplyChanges":{
691-
"message":"Apply changes",
691+
"message":"Bruk endringer",
692692
"description":"for generic 'Apply changes' buttons"
693693
},
694694
"genericRevert":{

src/advanced-settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</head>
1111

1212
<body>
13-
<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>
13+
<p><span data-i18n="advancedSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Advanced-settings" target="_blank">&#xf05a;</a>
1414
<p>
1515
<button id="advancedSettingsApply" class="custom important" type="button" disabled="true" data-i18n="genericApplyChanges"></button>&ensp;
1616
<p><textarea id="advancedSettings" dir="auto" spellcheck="false"></textarea>

0 commit comments

Comments
 (0)