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

This commit is contained in:
gorhill 2014-07-16 17:20:19 -04:00
commit 16db6182dd
1 changed files with 7 additions and 7 deletions

View File

@ -72,7 +72,7 @@
"description":"English: Show the number of blocked requests on the icon" "description":"English: Show the number of blocked requests on the icon"
}, },
"3pListsOfBlockedHostsPrompt":{ "3pListsOfBlockedHostsPrompt":{
"message":"{{netFilterCount}} filtre(s) actuellement en action :", "message":"{{netFilterCount}} filtre(s) réseau + {{cosmeticFilterCount}} filtres esthétiques actuellement en action :",
"description":"English: {{netFilterCount}} network filters {{cosmeticFilterCount}} cosmetic filters from:" "description":"English: {{netFilterCount}} network filters {{cosmeticFilterCount}} cosmetic filters from:"
}, },
"3pListsOfBlockedHostsPerListStats":{ "3pListsOfBlockedHostsPerListStats":{
@ -100,27 +100,27 @@
"description":"English: Apply changes" "description":"English: Apply changes"
}, },
"3pGroupAds":{ "3pGroupAds":{
"message":"Ads", "message":"Publicités",
"description":"English: Ads" "description":"English: Ads"
}, },
"3pGroupPrivacy":{ "3pGroupPrivacy":{
"message":"Privacy", "message":"Vie privée",
"description":"English: Privacy" "description":"English: Privacy"
}, },
"3pGroupMalware":{ "3pGroupMalware":{
"message":"Malware domains", "message":"Domaines malveillants",
"description":"English: Malware domains" "description":"English: Malware domains"
}, },
"3pGroupSocial":{ "3pGroupSocial":{
"message":"Social", "message":"Réseaux sociaux",
"description":"English: Social" "description":"English: Social"
}, },
"3pGroupMultipurpose":{ "3pGroupMultipurpose":{
"message":"Multipurpose", "message":"Multiple blocage",
"description":"English: Multipurpose" "description":"English: Multipurpose"
}, },
"3pGroupRegions":{ "3pGroupRegions":{
"message":"Regions, languages", "message":"Régions/Langues",
"description":"English: Regions, languages" "description":"English: Regions, languages"
}, },
"1pFormatHint":{ "1pFormatHint":{