Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Added help text to application specific settings
Browse files Browse the repository at this point in the history
Fixed #1968
  • Loading branch information
M66B committed Sep 8, 2014
1 parent 9aa940e commit 584058d
Show file tree
Hide file tree
Showing 48 changed files with 63 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 10 additions & 0 deletions res/layout/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,18 @@
android:orientation="vertical" >

<TextView
android:id="@+id/tvInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:text="@string/msg_settings_specific"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="italic" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dip"
android:text="@string/settings_general"
android:textAllCaps="true"
android:textStyle="bold" />
Expand Down
1 change: 1 addition & 0 deletions res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>بُذلت عناية كبيرة لتطوير وإختبار XPrivacy,
ومع ذلك فإنه من المستحيل ضمان أنه سيعمل خالياً من العيوب على كل جهاز ولكل تطبيق.
\n\nالإستخدام على مسئوليتك الخاصة.</b>\n\nراجع أيضاً الترخيص:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>XPrivacy е разработен и тестван с голямо внимание,
но е невъзможно да се гарантира безпроблемна работа на всякакви устройства при всякакви приложения.
\n\nИзползвате го на свой собствен риск.</b>\n\nВижте и лиценза:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nVegeu també la llicència:</string>
<string name="restrict_accounts">Comptes (Google, Facebook, etc.)</string>
<string name="restrict_browser">Navegador (marcadors/historial)</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nLicence aplikace:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nSe også licensen:</string>
<string name="restrict_accounts">Konti (Google, Facebook, osv.)</string>
<string name="restrict_browser">Browser (bogmærker/historik)</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Erfahrene Anwender werden gebeten, ihre Probleme weitgehend selbst zu lösen und anderen Anwendern im XDA XPrivacy Forum soweit wie möglich zu helfen</string>
<string name="msg_method_expert">Funktionsbeschränkungen sind für Experten vorgesehen. Sind Sie ein Experte?</string>
<string name="msg_longpress_whitelist">Drücken Sie lange auf den Funktionsnamen um einen Parameter auf die schwarze oder weiße Liste zu setzen</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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!</b>\n\nBitte beachten Sie auch die Lizenz:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ee/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nSee also the license:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>Μεγάλη προσοχή έχει ληφθεί για την ανάπτυξη και δοκιμή του XPrivacy,
ωστόσο, είναι αδύνατο να εγγυηθεί ότι θα λειτουργήσει άψογα σε κάθε συσκευή και για κάθε εφαρμογή.
\n\nΗ χρήση γίνεται αποκλειστικά με δική σας ευθύνη.</b>\n\nΔείτε επίσης την άδεια:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nVéase también el permiso:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>نرم افزار ایکس پرایوسی با دقت بالایی تولید و تست شده است، با این وجود تضمینی برای عملکرد صحیح
این نرم افزار بر روی تمامی دستگاه ها و در مورد تمامی نرم افزارها وجود ندارد.
\n\n ریسک استفاده از این نرم افزار بر عهده ی شما می باشد</b>\n\n:همچنین پروانه ی برنامه را مشاهده کنید</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nKatso myös lisenssi:</string>
<string name="restrict_accounts">Tilit (Google, Facebook, jne)</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">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</string>
<string name="msg_method_expert">La restriction des fonctions est destinée aux utilisateurs expérimentés. Êtes-vous un expert ?</string>
<string name="msg_longpress_whitelist">Faites un appui long sur le nom d\'une fonction pour mettre les paramètres en liste blanche/noire</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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 !</b>\n\nVeuillez prendre connaissance de la licence :</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ga/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nFéach freisin an ceadúnas:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nSee also the license:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>XPrivacy बनाने मैं बहुत ख्याल रखा गया है,
किन्तु वह सभी साधन और सभी application के लिए बरोबर चलेगा उसकी गारंटी देना असंभव है।
\n\nइसका उपयोग पूरी तरह से आपके अपने जोखिम पर है।</b>\n\nलाइसेंस को भी पढ़े:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nTakođer pogledati licencu:</string>
<string name="restrict_accounts" tools:ignore="UnusedResources">Korisnički računi</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nNézze meg a licenszet is:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Pengguna ahli diharapkan untuk memecahkan masalah mereka sendiri jika mungkin dan mengikuti forum XDA XPrivacy serta membantu yang lain jika memungkinkan</string>
<string name="msg_method_expert">Fungsi pembatasan ditujukan untuk pengguna ahli. Apakah Anda pengguna ahli?</string>
<string name="msg_longpress_whitelist">Tekan agak lama nama fungsi untuk parameter daftar hitam atau putih</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nLihat juga lisensinya:</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<string name="msg_expert">Expert users are supposed to solve their own problems where possible and to follow the XDA XPrivacy forum and help others where possible</string>
<string name="msg_method_expert">Function restrictions are meant for expert users. Are you an expert user?</string>
<string name="msg_longpress_whitelist">Long press function name to white or black list parameter</string>
<string name="msg_settings_specific">Check marks and values take precedence over global check marks and values; empty check boxes and values do not take precedence</string>
<string name="msg_first"><b>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.</b>\n\nVedi anche la licenza:</string>
Expand Down
Loading

0 comments on commit 584058d

Please sign in to comment.