Skip to content

Commit

Permalink
Display if on demand, menu to clear on demand choices
Browse files Browse the repository at this point in the history
  • Loading branch information
M66B committed Jan 30, 2014
1 parent 13e3aac commit 26cb701
Show file tree
Hide file tree
Showing 45 changed files with 105 additions and 27 deletions.
10 changes: 10 additions & 0 deletions res/layout/restrictionentry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/imgCBName"
android:textAppearance="?android:attr/textAppearanceSmall" />

<TextView
android:id="@+id/tvChosen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/imgCBName"
android:text="@string/msg_question"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="invisible" />
</RelativeLayout>

</LinearLayout>
1 change: 1 addition & 0 deletions res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">تحديد الكل</string>
<string name="menu_restriction_all">تبديل القيود</string>
<string name="menu_clear_all">مسح الكل</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">تقييد الكل</string>
<string name="menu_clear_usage">إزالة</string>
<string name="menu_usage_all">تغيير الفلتر</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 @@ -26,6 +26,7 @@
<string name="menu_all">Всички</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Totes</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Vše</string>
<string name="menu_restriction_all">Přepnout omezení</string>
<string name="menu_clear_all">Vymazat vše</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Omezit vše</string>
<string name="menu_clear_usage">Vymazat</string>
<string name="menu_usage_all">Přepnout filtr</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 @@ -26,6 +26,7 @@
<string name="menu_all">Alle</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Alles (beschränkt)</string>
<string name="menu_restriction_all">Beschränkungen invertieren</string>
<string name="menu_clear_all">Alles löschen</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Alles beschränken</string>
<string name="menu_clear_usage">Löschen</string>
<string name="menu_usage_all">Filter umkehren</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 @@ -26,6 +26,7 @@
<string name="menu_all">Kõik</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Όλα</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Todas</string>
<string name="menu_restriction_all">Restringir todo</string>
<string name="menu_clear_all">Permitir todo</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restringir todo</string>
<string name="menu_clear_usage">Limpiar</string>
<string name="menu_usage_all">Cambiar filtro</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 @@ -28,6 +28,7 @@
<string name="menu_all">همه</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">Kaikki</string>
<string name="menu_restriction_all">Vaihda rajoitukset</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Vaihda suodatin</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 @@ -26,6 +26,7 @@
<string name="menu_all">Tous</string>
<string name="menu_restriction_all">Inverser restrictions</string>
<string name="menu_clear_all">Tout effacer</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Tout restreindre</string>
<string name="menu_clear_usage">Effacer</string>
<string name="menu_usage_all">Basculer toutes/restreintes</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 @@ -26,6 +26,7 @@
<string name="menu_all">Gach</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">בחר הכול</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</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 @@ -26,6 +26,7 @@
<string name="menu_all">प्रत्येक</string>
<string name="menu_restriction_all">प्रतिबंध toggle करे</string>
<string name="menu_clear_all">सब clear करे</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">सब प्रतिबंध करे</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">फिल्टर toggle करे</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 @@ -26,6 +26,7 @@
<string name="menu_all">Minden</string>
<string name="menu_restriction_all">Korlátozások kapcsolása</string>
<string name="menu_clear_all">Összes törlése</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Összes korlátozása</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Szűrő kapcsolása</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 @@ -26,6 +26,7 @@
<string name="menu_all">Tutto</string>
<string name="menu_restriction_all">Imposta restrizioni</string>
<string name="menu_clear_all">Deseleziona tutto</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Seleziona tutto</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Imposta filtro</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">בחר הכול</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">全て</string>
<string name="menu_restriction_all">制限の身に切り替え</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">フィルタ</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<string name="menu_all">Visos</string>
<string name="menu_restriction_all">Išvalyti visus ribojimus</string>
<string name="menu_clear_all">Išvalyti viską</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Įjungti visus ribojimus</string>
<string name="menu_clear_usage">Valyti</string>
<string name="menu_usage_all">Perjungti filtrą</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nb-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Alle</string>
<string name="menu_restriction_all">Skift restriksjoner</string>
<string name="menu_clear_all">Nullstill alt</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Blokk alt</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Skift filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Alle</string>
<string name="menu_restriction_all">Schakel beperkingen</string>
<string name="menu_clear_all">Alles wissen</string>
<string name="menu_clear_ondemand">Wis op verzoek keuzes</string>
<string name="menu_restrict_all">Alles beperken</string>
<string name="menu_clear_usage">Wissen</string>
<string name="menu_usage_all">Schakel filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-nn-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Alle</string>
<string name="menu_restriction_all">Skift restriksjoner</string>
<string name="menu_clear_all">Nullstill alt</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Blokk alt</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Skift filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-no-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Alle</string>
<string name="menu_restriction_all">Skift restriksjoner</string>
<string name="menu_clear_all">Nullstill alt</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Blokk alt</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Skift filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Wszystko</string>
<string name="menu_restriction_all">Przełącz restrykcje</string>
<string name="menu_clear_all">Wyczyść wszystko</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Ogranicz wszystko</string>
<string name="menu_clear_usage">Wyczyść</string>
<string name="menu_usage_all">Przełącz filtry</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Tudo</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Tot</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Выделить все</string>
<string name="menu_restriction_all">Переключить разрешения</string>
<string name="menu_clear_all">Очистить все</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Запретить все</string>
<string name="menu_clear_usage">Очистить</string>
<string name="menu_usage_all">Переключить фильтр</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Všetko</string>
<string name="menu_restriction_all">Prepnúť obmedzenia</string>
<string name="menu_clear_all">Vymazať všetky</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Obmedziť všetky</string>
<string name="menu_clear_usage">Vymazať</string>
<string name="menu_usage_all">Prepnúť filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Vse</string>
<string name="menu_restriction_all">Preklopi omejitve</string>
<string name="menu_clear_all">Počisti vse</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Omeji vse</string>
<string name="menu_clear_usage">Počisti</string>
<string name="menu_usage_all">Preklopi filtre</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-sr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Све</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Alla</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-tl-rPH/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Kalahatan</string>
<string name="menu_restriction_all">Bigyan ng lahat o walang paghihigpit</string>
<string name="menu_clear_all">Burahin lahat ng paghihigpit</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Pahigpitan lahat</string>
<string name="menu_clear_usage">Burahin lahat nang nakatakdang kaalaman at ukol sa mga pahintulot na nagamit</string>
<string name="menu_usage_all">Ipakita sa lahat ng may pahintulot o sa mga may pahigpit lamang</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Tümü</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-ua/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Виділити все</string>
<string name="menu_restriction_all">Переключити довзоли</string>
<string name="menu_clear_all">Очистити всі</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Заборонити всі</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Переключити фільтр</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-vi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">Tất cả</string>
<string name="menu_restriction_all">Thay đổi các sự hạn chế</string>
<string name="menu_clear_all">Xóa tất cả</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Hạn chế tất cả</string>
<string name="menu_clear_usage">Xóa</string>
<string name="menu_usage_all">Thay đổi bộ lọc</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">全部权限</string>
<string name="menu_restriction_all">全选/不选列表中的应用</string>
<string name="menu_clear_all">清除限制</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">限制所有权限</string>
<string name="menu_clear_usage">清除权限使用记录</string>
<string name="menu_usage_all">过滤器开关</string>
Expand Down
1 change: 1 addition & 0 deletions res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="menu_all">所有程式</string>
<string name="menu_restriction_all">套用預設規則</string>
<string name="menu_clear_all">清除全部</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">限制全部</string>
<string name="menu_clear_usage">清除記錄</string>
<string name="menu_usage_all">切換顯示限制項目</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<string name="menu_all">All</string>
<string name="menu_restriction_all">Toggle restrictions</string>
<string name="menu_clear_all">Clear all</string>
<string name="menu_clear_ondemand">Clear on demand choices</string>
<string name="menu_restrict_all">Restrict all</string>
<string name="menu_clear_usage">Clear</string>
<string name="menu_usage_all">Toggle filter</string>
Expand Down Expand Up @@ -73,6 +74,7 @@
<string name="msg_upgrading" formatted="false">Upgrading %s</string>
<string name="msg_support_info">An internal check failed, do you want to send the support info?</string>
<string name="msg_ondemand" formatted="false">%1$s is trying to use a function in the %2$s category</string>
<string name="msg_question" translatable="false">\?</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 flawlessly 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
Loading

0 comments on commit 26cb701

Please sign in to comment.