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

This commit is contained in:
Mustafa Hasturk 2015-04-03 01:24:54 +03:00
commit 911925c3df
3 changed files with 10 additions and 10 deletions

View File

@ -36,9 +36,9 @@ uBlock's main goal is to help users neutralize privacy-invading apparatus — ad
* **Opera**: available on the [Opera Store](https://addons.opera.com/en-gb/extensions/details/ublock/).
* **Firefox**: available on the [Firefox Add-ons homepage](https://addons.mozilla.org/en-US/firefox/addon/ublock/), or for [manual]((https://github.com/chrisaljoudi/uBlock/releases)) installation.
* **Firefox**: available on the [Firefox Add-ons homepage](https://addons.mozilla.org/en-US/firefox/addon/ublock/), or for [manual](https://github.com/chrisaljoudi/uBlock/releases) installation.
* Due to Mozilla's review process, the version of uBlock available from the Add-ons homepage is often outdated. This isn't in our control.
* Due to Mozilla's review process, the version of uBlock available from the Add-ons homepage is currently often outdated. This isn't in our control.
## Performance

View File

@ -160,11 +160,11 @@
"description":"English: Make use of context menu where appropriate"
},
"settingsAdvancedUserPrompt":{
"message":"Ich bin ein erfahrener Benutzer (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>Pflichtlektüre<\/a>)",
"message":"Ich bin ein erfahrener Benutzer (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Advanced-user-features'>Pflichtlektüre<\/a>)",
"description":"English: "
},
"settingsExperimentalPrompt":{
"message":"Aktiviere experimentelle Features (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Experimental-features'>About<\/a>)",
"message":"Aktiviere experimentelle Features (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Experimental-features'>About<\/a>)",
"description":"English: Enable experimental features"
},
"settingsStorageUsed":{
@ -332,7 +332,7 @@
"description":"English: List of your dynamic filtering rules."
},
"rulesFormatHint":{
"message":"Regel-Syntax: <code>Quelle Ziel Typ Action<\/code> (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'> vollständige Dokumentation<\/a>).",
"message":"Regel-Syntax: <code>Quelle Ziel Typ Action<\/code> (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'> vollständige Dokumentation<\/a>).",
"description":"English: dynamic rule syntax and full documentation."
},
"whitelistPrompt":{
@ -527,4 +527,4 @@
"message":"Dieser Eintrag muss der letzte sein",
"description":"so we dont need to deal with comma for last entry"
}
}
}

View File

@ -160,11 +160,11 @@
"description":"English: Make use of context menu where appropriate"
},
"settingsAdvancedUserPrompt":{
"message":"Je suis un utilisateur expérimenté (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>À lire<\/a>)",
"message":"Je suis un utilisateur expérimenté (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Advanced-user-features'>À lire<\/a>)",
"description":"English: "
},
"settingsExperimentalPrompt":{
"message":"Activer les fonctionnalités expérimentales (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Experimental-features'>En savoir plus<\/a>)",
"message":"Activer les fonctionnalités expérimentales (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Experimental-features'>En savoir plus<\/a>)",
"description":"English: Enable experimental features"
},
"settingsStorageUsed":{
@ -332,7 +332,7 @@
"description":"English: List of your dynamic filtering rules."
},
"rulesFormatHint":{
"message":"Syntaxe des règles : <code>source destination type action<\/code> (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'>Documentation complète en Anglais<\/a>)",
"message":"Syntaxe des règles : <code>source destination type action<\/code> (<a href='https:\/\/github.com\/chrisaljoudi\/uBlock\/wiki\/Dynamic-filtering:-rule-syntax'>Documentation complète en Anglais<\/a>)",
"description":"English: dynamic rule syntax and full documentation."
},
"whitelistPrompt":{
@ -527,4 +527,4 @@
"message":"This entry must be the last one",
"description":"so we dont need to deal with comma for last entry"
}
}
}