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

Commit

Permalink
Display 'Default' as first template name
Browse files Browse the repository at this point in the history
Closes #1723
  • Loading branch information
M66B committed Jun 16, 2014
1 parent b7d8666 commit 6e255bc
Show file tree
Hide file tree
Showing 46 changed files with 99 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">السيريال#</string>
<string name="settings_lat">خط العرض</string>
<string name="settings_lon">خط الطول</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">Геогр. ширина</string>
<string name="settings_lon">Геогр. дължина</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Número de sèrie</string>
<string name="settings_lat">Latitud</string>
<string name="settings_lon">Longitud</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Sériové číslo</string>
<string name="settings_lat">Zeměpisná šířka</string>
<string name="settings_lon">Zeměpisná délka</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serienummer</string>
<string name="settings_lat">Breddegrad</string>
<string name="settings_lon">Længdegrad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ dass es einwandfrei auf wirklich JEDEM einzelnen Gerät und für JEDE einzelne A
<string name="title_template_merge">Template übernehmen (zusammenfügen)</string>
<string name="title_enable_ondemand">\"Beschränken nach Aufforderung\" aktivieren</string>
<string name="title_disable_ondemand">\"Beschränken nach Aufforderung\" deaktivieren</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Seriennummer</string>
<string name="settings_lat">Breitengrad</string>
<string name="settings_lon">Längengrad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ee/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega.
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Seeria#</string>
<string name="settings_lat">Laiuskraad</string>
<string name="settings_lon">Pikkuskraad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Σειριακός αριθμός</string>
<string name="settings_lat">Γεωγρ. πλάτος</string>
<string name="settings_lon">Γεωγρ. μήκος</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial"># de serie</string>
<string name="settings_lat">Latitud</string>
<string name="settings_lon">Longitud</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">شماره سریال</string>
<string name="settings_lat">عرض جغرافیایی</string>
<string name="settings_lon">طول جغرافیایی</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">sarjanumero#</string>
<string name="settings_lat">Latituudi</string>
<string name="settings_lon">Longituudi</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ il est impossible de garantir un fonctionnement parfait sur chaque appareil et p
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Activer \"restreindre sur demande\"</string>
<string name="title_disable_ondemand">Désactiver \"restreindre sur demande\"</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">N° de série</string>
<string name="settings_lat">Latitude</string>
<string name="settings_lon">Longitude</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ga/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Sraithuimhir#</string>
<string name="settings_lat">TX</string>
<string name="settings_lon">Domhanfhad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">קו אורך</string>
<string name="settings_lon">קו רוחב</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">क्रमांक#</string>
<string name="settings_lat">अक्षांश</string>
<string name="settings_lon">रेखांश</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ de lehetetlen garantálni hogy tökéletesen működjön az összes eszközön
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Sorozatszám#</string>
<string name="settings_lat">Szélesség</string>
<string name="settings_lon">Hosszúság</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ tuttavia non è possibile garantire che funzioni perfettamente su qualunque disp
<string name="title_template_merge">Applica modello (unisci)</string>
<string name="title_enable_ondemand">Abilita restrizioni su richiesta</string>
<string name="title_disable_ondemand">Disabilita restrizioni su richiesta</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Seriale#</string>
<string name="settings_lat">Latitudine</string>
<string name="settings_lon">Longitudine</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">קו אורך</string>
<string name="settings_lon">קו רוחב</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">シリアル番号</string>
<string name="settings_lat">緯度</string>
<string name="settings_lon">経度</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ku-rIQ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">سريال نه مبرى موبايل</string>
<string name="settings_lat">هیلی پانی</string>
<string name="settings_lon">هیلی دریژی</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ku-rIR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">سريال نه مبرى موبايل</string>
<string name="settings_lat">هیلی پانی</string>
<string name="settings_lon">هیلی دریژی</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ Tačiau neįmanoma garantuoti, kad dirbs nepriekaištingai su kiekvienu prietais
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Įjungti ribojimus pagal reikalavimą</string>
<string name="title_disable_ondemand">Išjungti ribojimus pagal reikalavimą</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">Platuma</string>
<string name="settings_lon">Ilguma</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ms/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ namun ia adalah mustahil untuk menjaminkan penggunaan sempurna untuk setiap pera
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Siri#</string>
<string name="settings_lat">Latitud</string>
<string name="settings_lon">Longitud</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-nb-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Aktiver blokkering på forespørsel</string>
<string name="title_disable_ondemand">Deaktiver blokkering på forespørsel</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serienummer</string>
<string name="settings_lat">Breddegrad</string>
<string name="settings_lon">Lengdegrad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ maar het is onmogelijk om te garanderen dat het op elk apparaat en voor elke app
<string name="title_template_merge">Pas sjabloon toe (samenvoegen)</string>
<string name="title_enable_ondemand">Zet op verzoek beperken aan</string>
<string name="title_disable_ondemand">Zet op verzoek beperken uit</string>
<string name="title_default">Standaard</string>
<string name="title_alternate">Alternatief</string>
<string name="settings_serial">Serienummer</string>
<string name="settings_lat">Breedtegraad</string>
<string name="settings_lon">Lengtegraad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-nn-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Aktiver blokkering på forespørsel</string>
<string name="title_disable_ondemand">Deaktiver blokkering på forespørsel</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serienummer</string>
<string name="settings_lat">Breddegrad</string>
<string name="settings_lon">Lengdegrad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-no-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Aktiver blokkering på forespørsel</string>
<string name="title_disable_ondemand">Deaktiver blokkering på forespørsel</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serienummer</string>
<string name="settings_lat">Breddegrad</string>
<string name="settings_lon">Lengdegrad</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Włącz restrykcje na żądanie</string>
<string name="title_disable_ondemand">Wyłącz restrykcje na żądanie</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Numer seryjny</string>
<string name="settings_lat">Szerokość geograficzna</string>
<string name="settings_lon">Długość geograficzna</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ porém é impossível garantir que irá funcionar sem problemas em todos os disp
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">Latitude</string>
<string name="settings_lon">Longitude</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">Latitudine</string>
<string name="settings_lon">Longitudine</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Включить запрос разрешений</string>
<string name="title_disable_ondemand">Отключить запрос разрешений</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Серийный номер</string>
<string name="settings_lat">Широта</string>
<string name="settings_lon">Долгота</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ avšak nie je nemožné zaručiť, že bude fungovať bezchybne na každom zaria
<string name="title_template_merge">Použiť šablónu (zlúčiť)</string>
<string name="title_enable_ondemand">Povoliť obmedzenie na požiadanie</string>
<string name="title_disable_ondemand">Zakázať obmedzenie na požiadanie</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Sériové číslo</string>
<string name="settings_lat">Zemepisná šírka</string>
<string name="settings_lon">Zemepisná dĺžka</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Omogoči omejevanje na zahtevo</string>
<string name="title_disable_ondemand">Onemogoči omejevanje na zahtevo</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serijska št.</string>
<string name="settings_lat">Geografska širina</string>
<string name="settings_lon">Geografska dolžina</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-sr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ however it is impossible to guarantee it will work flawless on each and every de
<string name="title_template_merge">Apply template (merge)</string>
<string name="title_enable_ondemand">Enable on demand restricting</string>
<string name="title_disable_ondemand">Disable on demand restricting</string>
<string name="title_default">Default</string>
<string name="title_alternate">Alternate</string>
<string name="settings_serial">Serial#</string>
<string name="settings_lat">Ширина</string>
<string name="settings_lon">Дужина</string>
Expand Down
Loading

0 comments on commit 6e255bc

Please sign in to comment.