diff --git a/CHANGELOG.md b/CHANGELOG.md index 58f92fd43..704115719 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ Changelog * Applying template with on demand restricting will enabled on demand restricting setting ([issue](/../../issues/1727)) * Fixed *inet*, *media* and *sdcard* always on demand restricting ([issue](/../../issues/1722)) * Do not import version number ([issue](/../../issues/1721)) +* Display *Default* as first template name ([issue](/../../issues/1723)) +* Updated Dutch translation [Open issues](https://github.com/M66B/XPrivacy/issues?state=open) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 7f603593f..d0c87a614 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate السيريال# خط العرض خط الطول diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index e263c158f..49388d813 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Геогр. ширина Геогр. дължина diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index d2bb5e180..d008a0408 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -136,6 +136,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Número de sèrie Latitud Longitud diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2fb0aa029..d09c401b8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -138,6 +138,8 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Sériové číslo Zeměpisná šířka Zeměpisná délka diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5702417bc..f17c177b2 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -136,6 +136,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serienummer Breddegrad Længdegrad diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index aa697685e..f2afe8338 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -138,6 +138,8 @@ dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne A Template übernehmen (zusammenfügen) \"Beschränken nach Aufforderung\" aktivieren \"Beschränken nach Aufforderung\" deaktivieren + Default + Alternate Seriennummer Breitengrad Längengrad diff --git a/res/values-ee/strings.xml b/res/values-ee/strings.xml index ac2551bfb..eb85e3b43 100644 --- a/res/values-ee/strings.xml +++ b/res/values-ee/strings.xml @@ -138,6 +138,8 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega. Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Seeria# Laiuskraad Pikkuskraad diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 434598f45..f6f867d84 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Σειριακός αριθμός Γεωγρ. πλάτος Γεωγρ. μήκος diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3ed03308e..7f07aa825 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -138,6 +138,8 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate # de serie Latitud Longitud diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 43ffe8a14..ffe068cfe 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -140,6 +140,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate شماره سریال عرض جغرافیایی طول جغرافیایی diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 458da721f..144be3688 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -137,6 +137,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate sarjanumero# Latituudi Longituudi diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4519d8a4a..c4a6108ae 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -138,6 +138,8 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p Apply template (merge) Activer \"restreindre sur demande\" Désactiver \"restreindre sur demande\" + Default + Alternate N° de série Latitude Longitude diff --git a/res/values-ga/strings.xml b/res/values-ga/strings.xml index 1762f405c..2c20bf613 100644 --- a/res/values-ga/strings.xml +++ b/res/values-ga/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Sraithuimhir# TX Domhanfhad diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 4d1f74342..ebc9e2784 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# קו אורך קו רוחב diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 9d915b9d3..8511e398b 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate क्रमांक# अक्षांश रेखांश diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 68b023fae..2cf972a95 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -138,6 +138,8 @@ de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Sorozatszám# Szélesség Hosszúság diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index fb3a7d98e..e0c325086 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -139,6 +139,8 @@ tuttavia non è possibile garantire che funzioni perfettamente su qualunque disp Applica modello (unisci) Abilita restrizioni su richiesta Disabilita restrizioni su richiesta + Default + Alternate Seriale# Latitudine Longitudine diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 99a933c99..22da5a9ab 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# קו אורך קו רוחב diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index aee3d1d48..a1c4779b0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate シリアル番号 緯度 経度 diff --git a/res/values-ku-rIQ/strings.xml b/res/values-ku-rIQ/strings.xml index 4b86a8a2a..c64012c61 100644 --- a/res/values-ku-rIQ/strings.xml +++ b/res/values-ku-rIQ/strings.xml @@ -137,6 +137,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate سريال نه مبرى موبايل هیلی پانی هیلی دریژی diff --git a/res/values-ku-rIR/strings.xml b/res/values-ku-rIR/strings.xml index 4b86a8a2a..c64012c61 100644 --- a/res/values-ku-rIR/strings.xml +++ b/res/values-ku-rIR/strings.xml @@ -137,6 +137,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate سريال نه مبرى موبايل هیلی پانی هیلی دریژی diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 44abafda3..d85cfb432 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -138,6 +138,8 @@ Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietais Apply template (merge) Įjungti ribojimus pagal reikalavimą Išjungti ribojimus pagal reikalavimą + Default + Alternate Serial# Platuma Ilguma diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 1645041f1..b03e6392b 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -138,6 +138,8 @@ namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap pera Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Siri# Latitud Longitud diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index 3a1e43de1..5cfb00be3 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -136,6 +136,8 @@ Apply template (merge) Aktiver blokkering på forespørsel Deaktiver blokkering på forespørsel + Default + Alternate Serienummer Breddegrad Lengdegrad diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e943be066..43773c9b0 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -138,6 +138,8 @@ maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke app Pas sjabloon toe (samenvoegen) Zet op verzoek beperken aan Zet op verzoek beperken uit + Standaard + Alternatief Serienummer Breedtegraad Lengtegraad diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index 3a1e43de1..5cfb00be3 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -136,6 +136,8 @@ Apply template (merge) Aktiver blokkering på forespørsel Deaktiver blokkering på forespørsel + Default + Alternate Serienummer Breddegrad Lengdegrad diff --git a/res/values-no-rNO/strings.xml b/res/values-no-rNO/strings.xml index 3a1e43de1..5cfb00be3 100644 --- a/res/values-no-rNO/strings.xml +++ b/res/values-no-rNO/strings.xml @@ -136,6 +136,8 @@ Apply template (merge) Aktiver blokkering på forespørsel Deaktiver blokkering på forespørsel + Default + Alternate Serienummer Breddegrad Lengdegrad diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 66a7b87f0..52ea2ee9b 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Włącz restrykcje na żądanie Wyłącz restrykcje na żądanie + Default + Alternate Numer seryjny Szerokość geograficzna Długość geograficzna diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index f34c904a7..4d889b9f3 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -138,6 +138,8 @@ porém é impossível garantir que irá funcionar sem problemas em todos os disp Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Latitude Longitude diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c70d75466..0a443561b 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Latitudine Longitudine diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 70edb8b88..ff6bbb798 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Включить запрос разрешений Отключить запрос разрешений + Default + Alternate Серийный номер Широта Долгота diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 85f80bf3a..2d8b3a812 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -138,6 +138,8 @@ avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zaria Použiť šablónu (zlúčiť) Povoliť obmedzenie na požiadanie Zakázať obmedzenie na požiadanie + Default + Alternate Sériové číslo Zemepisná šírka Zemepisná dĺžka diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 7bad0e2cb..6b97bbc30 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Omogoči omejevanje na zahtevo Onemogoči omejevanje na zahtevo + Default + Alternate Serijska št. Geografska širina Geografska dolžina diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index e65269f69..8cdb492f1 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Ширина Дужина diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 905861d29..24c099c61 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -138,6 +138,8 @@ Det är emellertid omöjligt att garantera att appen fungerar på alla enheter o Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Latitud Longitud diff --git a/res/values-tl-rPH/strings.xml b/res/values-tl-rPH/strings.xml index 7588860d3..942991a3c 100644 --- a/res/values-tl-rPH/strings.xml +++ b/res/values-tl-rPH/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Ang iyong Seryal# Latitud Longhitud diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index af9f33fea..b36690938 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -137,6 +137,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Seri no Enlem Boylam diff --git a/res/values-ua/strings.xml b/res/values-ua/strings.xml index e609d8234..6a9fea7cb 100644 --- a/res/values-ua/strings.xml +++ b/res/values-ua/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Серійний номер Широта Довгота diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index a3bc80d37..a0b74a4ff 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -137,6 +137,8 @@ Apply template (merge) Kích hoạt hạn chế theo yêu cầu truy cập Tắt hạn chế theo yêu cầu truy cập + Default + Alternate Serial# Vĩ độ Kinh độ diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 85b2da5e5..6fe049299 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -138,6 +138,8 @@ 应用模板(合并) 开启按需权限限制 关闭按需权限限制 + Default + Alternate 序列号 纬度 经度 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index e71b64800..d56245f42 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -138,6 +138,8 @@ Apply template (merge) 開啟互動式限制 關閉互動式限制 + Default + Alternate 序號 緯度 經度 diff --git a/res/values/strings.xml b/res/values/strings.xml index 6ebf46f67..bc21b5632 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -147,6 +147,8 @@ however it is impossible to guarantee it will work flawlessly on each and every Apply template (merge) Enable on demand restricting Disable on demand restricting + Default + Alternate Serial# Latitude Longitude diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java index 1c3a871a9..8d7557280 100644 --- a/src/biz/bokhorst/xprivacy/ActivityMain.java +++ b/src/biz/bokhorst/xprivacy/ActivityMain.java @@ -629,8 +629,9 @@ private void optionTemplate() { // Template selector SpinnerAdapter spAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item); spAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - for (int i = 1; i <= 5; i++) - spAdapter.add(getString(R.string.menu_template) + " " + i); + spAdapter.add(getString(R.string.title_default)); + for (int i = 1; i <= 4; i++) + spAdapter.add(getString(R.string.title_alternate) + " " + i); spTemplate.setAdapter(spAdapter); // Template definition diff --git a/src/biz/bokhorst/xprivacy/ActivityShare.java b/src/biz/bokhorst/xprivacy/ActivityShare.java index b12d9c386..248c3f849 100644 --- a/src/biz/bokhorst/xprivacy/ActivityShare.java +++ b/src/biz/bokhorst/xprivacy/ActivityShare.java @@ -237,11 +237,12 @@ protected void onCreate(Bundle savedInstanceState) { spRestriction.setSelection(pos); // Build template adapter - SpinnerAdapter saAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item); - saAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - for (int i = 1; i <= 5; i++) - saAdapter.add(getString(R.string.menu_template) + " " + i); - spTemplate.setAdapter(saAdapter); + SpinnerAdapter spAdapter = new SpinnerAdapter(this, android.R.layout.simple_spinner_item); + spAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spAdapter.add(getString(R.string.title_default)); + for (int i = 1; i <= 4; i++) + spAdapter.add(getString(R.string.title_alternate) + " " + i); + spTemplate.setAdapter(spAdapter); // Build application list AppListTask appListTask = new AppListTask(); diff --git a/tools/addstring.sh b/tools/addstring.sh index d1f4cfbf0..bd487db1e 100755 --- a/tools/addstring.sh +++ b/tools/addstring.sh @@ -1,6 +1,8 @@ #!/bin/bash -grep -RIl "\Apply template (merge)" +grep -RIl "\Alternate" +grep -RIl "\Default" #grep -RIl "\