From 584058d7ffd64ca6820ac9671795f83ea48909ed Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 8 Sep 2014 21:17:39 +0200 Subject: [PATCH] Added help text to application specific settings Fixed #1968 --- CHANGELOG.md | 2 ++ res/layout/settings.xml | 10 ++++++++++ res/values-ar/strings.xml | 1 + res/values-bg/strings.xml | 1 + res/values-ca/strings.xml | 1 + res/values-cs/strings.xml | 1 + res/values-da/strings.xml | 1 + res/values-de/strings.xml | 1 + res/values-ee/strings.xml | 1 + res/values-el/strings.xml | 1 + res/values-es/strings.xml | 1 + res/values-fa/strings.xml | 1 + res/values-fi/strings.xml | 1 + res/values-fr/strings.xml | 1 + res/values-ga/strings.xml | 1 + res/values-he/strings.xml | 1 + res/values-hi/strings.xml | 1 + res/values-hr/strings.xml | 1 + res/values-hu/strings.xml | 1 + res/values-in/strings.xml | 1 + res/values-it/strings.xml | 1 + res/values-iw/strings.xml | 1 + res/values-ja/strings.xml | 1 + res/values-ku-rIQ/strings.xml | 1 + res/values-ku-rIR/strings.xml | 1 + res/values-lt/strings.xml | 1 + res/values-ms/strings.xml | 1 + res/values-nb-rNO/strings.xml | 1 + res/values-nl/strings.xml | 1 + res/values-nn-rNO/strings.xml | 1 + res/values-no-rNO/strings.xml | 1 + res/values-pl/strings.xml | 1 + res/values-pt/strings.xml | 1 + res/values-ro/strings.xml | 1 + res/values-ru/strings.xml | 1 + res/values-sk/strings.xml | 1 + res/values-sl/strings.xml | 1 + res/values-sr/strings.xml | 1 + res/values-sv/strings.xml | 1 + res/values-tl-rPH/strings.xml | 1 + res/values-tr/strings.xml | 1 + res/values-ua/strings.xml | 1 + res/values-vi/strings.xml | 1 + res/values-zh-rCN/strings.xml | 1 + res/values-zh-rTW/strings.xml | 1 + res/values/strings.xml | 1 + src/biz/bokhorst/xprivacy/ActivitySettings.java | 4 ++++ tools/addstring.sh | 6 +++--- 48 files changed, 63 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02d48e3c3..3b683f9f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ See for more information about XPrivacy 3 [this FAQ](https://github.com/M66B/XPr **Next release** +* Added help text to application specific settings ([issue](/../../issues/1968)) +* Updated Dutch translation * Updated French translation * Updated German translation diff --git a/res/layout/settings.xml b/res/layout/settings.xml index a1203aa9d..5614eaf6f 100644 --- a/res/layout/settings.xml +++ b/res/layout/settings.xml @@ -17,8 +17,18 @@ android:orientation="vertical" > + + diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index ce860a317..fbcf06c8f 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence بُذلت عناية كبيرة لتطوير وإختبار XPrivacy, ومع ذلك فإنه من المستحيل ضمان أنه سيعمل خالياً من العيوب على كل جهاز ولكل تطبيق. \n\nالإستخدام على مسئوليتك الخاصة.\n\nراجع أيضاً الترخيص: diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index d8d3aada7..55391cb6d 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy е разработен и тестван с голямо внимание, но е невъзможно да се гарантира безпроблемна работа на всякакви устройства при всякакви приложения. \n\nИзползвате го на свой собствен риск.\n\nВижте и лиценза: diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 1f30afc4c..303116471 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence S\'ha tingut molta cura desenvolupant i provant XPrivacy, però és impossible garantir que funcionarà perfectament a tots els dispositius i per a totes les aplicacions.\n\nUtilitzeu-lo sota el vostre propi risc.\n\nVegeu també la llicència: Comptes (Google, Facebook, etc.) Navegador (marcadors/historial) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2d51e6563..012711ae9 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Vývoj a testování aplikace XPrivacy probíhaly s maximální možnou péčí, nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a se všemi aplikacemi. \n\nPoužívejte pouze na vlastní riziko.\n\nLicence aplikace: diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index c31c5a18d..d8fc7e36b 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy er grundigt udviklet og testet, dog er det umuligt at garantere, at appen fungerer fejlfrit på alle enheder og for alle apps.\n\nBrug af denne app foregår udelukkende på egen risiko.\n\nSe også licensen: Konti (Google, Facebook, osv.) Browser (bogmærker/historik) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a6f16e038..2ccf00f38 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -79,6 +79,7 @@ Erfahrene Anwender werden gebeten, ihre Probleme weitgehend selbst zu lösen und anderen Anwendern im XDA XPrivacy Forum soweit wie möglich zu helfen Funktionsbeschränkungen sind für Experten vorgesehen. Sind Sie ein Experte? Drücken Sie lange auf den Funktionsnamen um einen Parameter auf die schwarze oder weiße Liste zu setzen + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy wurde mit größter Sorgfalt entwickelt und getestet.\nDennoch kann nicht gewährleistet werden, dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne App funktioniert. \n\nSie verwenden XPrivacy ausschließlich auf eigenes Risiko!\n\nBitte beachten Sie auch die Lizenz: diff --git a/res/values-ee/strings.xml b/res/values-ee/strings.xml index 4f6925456..dddf46382 100644 --- a/res/values-ee/strings.xml +++ b/res/values-ee/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Palju vaeva on nähtud Xprivacy arendamisel ja testimisel, kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega. \n\nKasuta ainult omal vastutusel.\n\nSee also the license: diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index c3a22198e..89460c375 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Μεγάλη προσοχή έχει ληφθεί για την ανάπτυξη και δοκιμή του XPrivacy, ωστόσο, είναι αδύνατο να εγγυηθεί ότι θα λειτουργήσει άψογα σε κάθε συσκευή και για κάθε εφαρμογή. \n\nΗ χρήση γίνεται αποκλειστικά με δική σας ευθύνη.\n\nΔείτε επίσης την άδεια: diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0389b7e6c..01b373ac7 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Se ha puesto mucho cuidado en el desarrollo y pruebas de XPrivacy, sin embargo no puedo garantizar que funcione sin ningún fallo para cada dispositivo y aplicación. \n\nÚselo bajo su responsabilidad.\n\nVéase también el permiso: diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 94613f821..3a8515196 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -81,6 +81,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence نرم افزار ایکس پرایوسی با دقت بالایی تولید و تست شده است، با این وجود تضمینی برای عملکرد صحیح این نرم افزار بر روی تمامی دستگاه ها و در مورد تمامی نرم افزارها وجود ندارد. \n\n ریسک استفاده از این نرم افزار بر عهده ی شما می باشد\n\n:همچنین پروانه ی برنامه را مشاهده کنید diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 5526444cc..cd5b1378c 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Xprivacy on tehty ja testattu huolellisesti, mutta on kuitenkin mahdotonta antaa takeita että se toimii virheettömästi kaikissa laitteissa ja jokaisessa applikaatiossa. \n\nKäyttö on täysin omalla vastuullasi.\n\nKatso myös lisenssi: Tilit (Google, Facebook, jne) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 257d191fd..cca1c8b41 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -79,6 +79,7 @@ Les utilisateurs expérimentés sont sensés résoudre leurs problèmes par eux-mêmes, de suivre le forum de XPrivacy sur XDA et d\'aider les autres si possible La restriction des fonctions est destinée aux utilisateurs expérimentés. Êtes-vous un expert ? Faites un appui long sur le nom d\'une fonction pour mettre les paramètres en liste blanche/noire + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Un grand soin est apporté au développement et aux tests de XPrivacy. Toutefois, il est impossible de garantir un fonctionnement parfait sur chaque appareil et pour chaque application. \nSon utilisation est à vos risques et périls !\n\nVeuillez prendre connaissance de la licence : diff --git a/res/values-ga/strings.xml b/res/values-ga/strings.xml index 596485422..4c26a9fe7 100644 --- a/res/values-ga/strings.xml +++ b/res/values-ga/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence cúram mór aire do a fhorbairt agus a thástáil XPrivacy, áfach, go bhfuil sé dodhéanta a ráthú go mbeidh sé obair flawless ar gach gléas agus do gach agus gach iarratas. \n\nBain úsáid as ar do phriacal féin.\n\nFéach freisin an ceadúnas: diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index b9f639c86..aeefdbabe 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 30937e913..a0204e701 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy बनाने मैं बहुत ख्याल रखा गया है, किन्तु वह सभी साधन और सभी application के लिए बरोबर चलेगा उसकी गारंटी देना असंभव है। \n\nइसका उपयोग पूरी तरह से आपके अपने जोखिम पर है।\n\nलाइसेंस को भी पढ़े: diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index cf41843bf..72f0875ba 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Unatoč velikoj pažnji koja je bila potrebna da bi se razvio i testirao Xprivacy, nemoguće je garantirati da će raditi savršeno na svakom uređaju i/ili za svaku aplikaciju. \n\nKoristiti isključivo na vlastitu odgovornost.\n\nTakođer pogledati licencu: Korisnički računi diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 55d40ee29..2ef373f14 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Az XPrivacy fejlesztése és tesztelése nagy gondossággal történik, de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön és az összes alkalmazással. \n\nCsak saját felelősségre.\n\nNézze meg a licenszet is: diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index a1e616824..23f133526 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -79,6 +79,7 @@ Pengguna ahli diharapkan untuk memecahkan masalah mereka sendiri jika mungkin dan mengikuti forum XDA XPrivacy serta membantu yang lain jika memungkinkan Fungsi pembatasan ditujukan untuk pengguna ahli. Apakah Anda pengguna ahli? Tekan agak lama nama fungsi untuk parameter daftar hitam atau putih + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Perhatian yang sangat besar telah dilakukan untuk mengembangkan dan menguji XPrivacy, Namun mustahil untuk menjamin akan berjalan lancar pada setiap perangkat dan untuk setiap aplikasi. \n\nGunakan sepenuhnya dengan resiko Anda sendiri.\n\nLihat juga lisensinya: diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a74682526..558d3697a 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Grande cura è stata posta nello sviluppo e verifica di XPrivacy, tuttavia non è possibile garantire che funzioni perfettamente su qualunque dispositivo e per qualsiasi applicazione. \n\nL\'utilizzo è interamente a tuo rischio.\n\nVedi anche la licenza: diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 812c80a52..f36d837da 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ecf9f45a0..95b99e32d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -79,6 +79,7 @@ 上級者は、なるべく自分自身で問題を解決すること、XDA フォーラムの XPrivacy スレッドを購読すること、そして他の利用者をできるだけ助けることが求められます 機能別の制限の設定は上級者向けです。あなたは上級者ですか? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy の開発およびテストには細心の注意を払いましたが、 すべての端末のあらゆるアプリで完璧な動作を保証することは不可能です。 \n\n完全に自己責任のうえでご利用ください。\n\nライセンスについて : diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml index 9fee7ec05..ef4bd77f0 100644 --- a/res/values-ku-rIQ/strings.xml +++ b/res/values-ku-rIQ/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence هه ول و ماندو بوونیکی زور دراوه بو دروستکردن و تاقیکردنه وه ی ئه م به رنامه يه به لام له گه ل ئه وه شدا ناتوانين دلنياتان بكه ين له وه ىكه ئه م به رنامه يه بى هه له يه و له سه ر هه موو موبايليك ياخود بو هه ر به رنامه يه ك كار ده كات. \n\nته نيا خوت به رپرسیاریت له به کارهینانی ئه م به رنامه يه.\n\nهه روه ها سه يريكى موله تى ريپیدان بکه: حیسابه کان (گوگل, فه یسبوک, هتد) diff --git a/res/values-ku-rIR/strings.xml b/res/values-ku-rIR/strings.xml index 9fee7ec05..ef4bd77f0 100644 --- a/res/values-ku-rIR/strings.xml +++ b/res/values-ku-rIR/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence هه ول و ماندو بوونیکی زور دراوه بو دروستکردن و تاقیکردنه وه ی ئه م به رنامه يه به لام له گه ل ئه وه شدا ناتوانين دلنياتان بكه ين له وه ىكه ئه م به رنامه يه بى هه له يه و له سه ر هه موو موبايليك ياخود بو هه ر به رنامه يه ك كار ده كات. \n\nته نيا خوت به رپرسیاریت له به کارهینانی ئه م به رنامه يه.\n\nهه روه ها سه يريكى موله تى ريپیدان بکه: حیسابه کان (گوگل, فه یسبوک, هتد) diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index fcca577e1..10ca4127b 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Puiku, kad sutikote išbandyti XPrivacy. Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietaisu. \n\nTodėl naudokite visiškai savo pačių rizika.\n\nTaip pat žiūrėkite licenciją: diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 52e8a1ef5..747846de6 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Penjagaan rapi telah diambil untuk membangunkan dan menguji XPrivacy, namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap peranti dan untuk semua applikasi. \n\nPenggunaan adalah sepenuhnya di atas risiko sendiri.\n\nLihat juga lesen: diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index f1f880635..10b2d6654 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 8d02d3e21..95dff9c88 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -79,6 +79,7 @@ Van ervaren gebruikers wordt verwacht dat zij waar mogelijk hun eigen problemen oplossen en dat zij het XDA XPrivacy forum volgen en anderen helpen waar mogelijk Functie beperkingen zijn bedoeld voor experts. Bent u een expert? Druk lang op een functienaam om een parameter op de witte of zwarte lijst te zetten + Vinkjes en waarden gaan voor globale vinkjes en waarden; lege vinkjes en waarden gaan niet voor XPrivacy is zorgvuldig ontwikkeld en getest, maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke applicatie foutloos werkt. \n\nGebruik is geheel op eigen risico.\n\nZie ook de licentie: diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index f1f880635..10b2d6654 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-no-rNO/strings.xml b/res/values-no-rNO/strings.xml index f1f880635..10b2d6654 100644 --- a/res/values-no-rNO/strings.xml +++ b/res/values-no-rNO/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy er grundig utviklet og testet, men det er umulig å garantere at Appen fungerer feilfritt på alle enheter og for alle applikasjoner.\n\nAppen brukes på egen risiko.\n\nSe også lisensen: Konto (Google, Facebook, osv.) Nettleser (bokmerker/historikk) diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 6bc8e544d..ca2c43a4f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Dołożyliśmy wszelkich starań podczas programowania i testów XPrivacy. Jednak nie możemy zagwarantować, że będzie on działać bezbłędnie na każdym urządzeniu oraz z każdą aplikacją. \n\nUżywasz go całkowicie na własne ryzyko.\n\nZobacz też licencję: diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index dbdc00288..64f64b72c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence A aplicação XPrivacy foi desenvolvida e testada com todo o cuidado, porém é impossível garantir que irá funcionar sem problemas em todos os dispositivos e com todas as aplicações. \n\nO uso desta aplicação é inteiramente por sua conta e risco.\n\nVer também a licença: diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 32f256059..611dc80ab 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 966fcae60..c6799e024 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Большое внимание было уделено разработке и тестированию XPrivacy, однако нельзя гарантировать, что оно будет работать безупречно на всех устройствах и со всеми приложениями. \n\nИспользуйте исключительно на свой страх и риск.\n\nСм. также лицензию: diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 0436e628e..8e7190542 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -79,6 +79,7 @@ Skusení používatelia dokážu vyriešiť svoje problémy vo väčšine prípadov a nasledovať tému XPrivacy na XDA fóre a pomáhať ostatným, ak je to možné Obmedzenia funkcií sú určené pre skúsených užívateľov. Ste skúsený používateľ? Dlho stlačte názov funkcie pre umiestnenie parametra na bielu alebo čiernu listinu + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Veľká starostlivosť bola venovaná vývoju a testovaniu XPrivacy, avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zariadení a na každú aplikáciu. \n\nPoužitie je plne na vlastné riziko.\n\nPozrite tiež licenciu: diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 6c72b7d03..44f0a5328 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence V razvoj in preizkušanje programa XPrivacy je bilo vloženo veliko truda, vendar pa je nemogoče zagotoviti brezhibno delovanje na vsaki napravi in za vsak program.\n\nUporaba programa je na lastno odgovornost\n\nPreberite si tudi licenco: diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 188282b16..764747e1d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawless on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 9951f18b3..4b20eb83d 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy utvecklas och testas med stor omsorg. Det är emellertid omöjligt att garantera att appen fungerar på alla enheter och appar. \n\nAnvänding sker helt på egen risk.\n\nSe också licensen: diff --git a/res/values-tl-rPH/strings.xml b/res/values-tl-rPH/strings.xml index 17547ec81..c241a0c1d 100644 --- a/res/values-tl-rPH/strings.xml +++ b/res/values-tl-rPH/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Malaking pag-aalaga ang ginampanan sa pagkabuo at sa pagsusuri ng XPrivacy, ngunit sadyang walang garantisado na gagana siya na walang kamali-mali sa lahat ng mga kagamitan o bawat sa isa\'t isang aplikasyon. \n\nAng paggamit nito ay ganap na nasa sa iyong pagbabakasakali.\n\nAlamin din ang kanyang lisensiya at sangguni dito sa: diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 62311e9e7..74e3420d8 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Xprivacy titizlikle geliştirilmiş ve test edilmiştir, ancak her cihazda veya her uygulamada kusursuz çalışacağını garantilemek imkansızdır. \n\nKullanım riski tamamen size aittir.\n\nAyrıca lisansa bakınız: Hesaplar (Google, Facebook, vb) diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml index 401ec72d4..47f0819ad 100644 --- a/res/values-ua/strings.xml +++ b/res/values-ua/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Велика увага була приділена розробці та тестуванню XPrivacy, але не можна гарантувати, що вона буде працювати бездоганно на всіх пристроях та зі всімома програмами. \n\nВикористовуйте виключно на свій страх та ризик.\n\nДив. також ліцензію: diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 02a7c78d0..c6290e30b 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy đã được lập trình và kiểm tra một cách cẩn trọng nhất, tuy nhiên, không thể đảm bảo chắc chắn XPrivacy sẽ hoạt động trơn tru trên mọi thiết bị cũng như với mọi ứng dụng. \n\nBạn tự chịu trách nhiệm khi sử dụng ứng dụng này.\n\nXem thêm về bản quyền: Các tài khoản (Google, Facebook, ...) diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 65e9af6c9..3c71035e0 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence XPrivacy 的开发和测试工作已经非常全面和细致, 但仍然不可能保证它能完美兼容所有设备及应用。 \n\n使用者需自行承担风险。\n\n另请参阅使用许可: diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 92339b931..85d8411a6 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -79,6 +79,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence 儘管 XPrivacy 在開發過程中經過詳細測試，但仍無法保證可以在所有裝置/安卓版本/各app上正常使用 \n\n請自行承擔使用XPrivacy的可能風險。 \n\n請參閱說明文件： diff --git a/res/values/strings.xml b/res/values/strings.xml index 0a01a17ae..01cd48484 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -84,6 +84,7 @@ Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible Function restrictions are meant for expert users. Are you an expert user? Long press function name to white or black list parameter + Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence Great care has been taken to develop and test XPrivacy, however it is impossible to guarantee it will work flawlessly on each and every device and for each and every application. \n\nUse is entirely at your own risk.\n\nSee also the license: diff --git a/src/biz/bokhorst/xprivacy/ActivitySettings.java b/src/biz/bokhorst/xprivacy/ActivitySettings.java index 5f3196cdf..a05956d67 100644 --- a/src/biz/bokhorst/xprivacy/ActivitySettings.java +++ b/src/biz/bokhorst/xprivacy/ActivitySettings.java @@ -29,6 +29,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; import android.widget.LinearLayout; +import android.widget.TextView; import android.widget.Toast; public class ActivitySettings extends ActivityBase implements OnCheckedChangeListener, OnClickListener { @@ -108,6 +109,8 @@ protected void onCreate(Bundle savedInstanceState) { uid = userId; // Reference controls + TextView tvInfo = (TextView) findViewById(R.id.tvInfo); + cbNotify = (CheckBox) findViewById(R.id.cbNotify); cbOnDemand = (CheckBox) findViewById(R.id.cbOnDemand); cbBlacklist = (CheckBox) findViewById(R.id.cbBlacklist); @@ -254,6 +257,7 @@ protected void onCreate(Bundle savedInstanceState) { // Set current values if (uid == userId) { // Global settings + tvInfo.setVisibility(View.GONE); cbUsage.setChecked(usage); cbParameters.setChecked(parameters); cbParameters.setEnabled(Util.hasProLicense(this) != null); diff --git a/tools/addstring.sh b/tools/addstring.sh index cb9450767..ad3036431 100755 --- a/tools/addstring.sh +++ b/tools/addstring.sh @@ -1,8 +1,8 @@ #!/bin/bash -grep -RIl "\Long press function name to white or black list parameter' +grep -RIl "\Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence' #grep -RIl "\