Merge pull request #153 from licaon-kter/Wi-Fi

Cosmetic fix Wifi
2015-11-15 20:33:21 +01:00 · 2015-11-15 20:33:21 +01:00 · cace7bf9a1
parent ac5efae56f 53876d95c1
commit cace7bf9a1
17 changed files with 36 additions and 36 deletions
--- a/PLAY-zh-rCN.md
+++ b/PLAY-zh-rCN.md
@ -15,7 +15,7 @@ Long description
 ----------------
 NetGuard是一款简洁的网络权限管理应用 - 无需root权限.

-可独立允许/阻止软件访问WiFI和/或移动网络.
+可独立允许/阻止软件访问Wi-Fi和/或移动网络.

 阻止应用访问网络有利于:

--- a/PLAY.md
+++ b/PLAY.md
@ -15,7 +15,7 @@ Long description
 ----------------
 NetGuard provides a simple way to block access to the internet - no root required.

-Applications can individually be allowed or denied access to your WiFi and/or mobile connection.
+Applications can individually be allowed or denied access to your Wi-Fi and/or mobile connection.

 Blocking access to the internet can help:

--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # NetGuard

 *NetGuard* provides a simple way to block access to the internet - no root required.
-Applications can individually be allowed or denied access to your WiFi and/or mobile connection.
+Applications can individually be allowed or denied access to your Wi-Fi and/or mobile connection.

 Blocking access to the internet can help:

@ -51,12 +51,12 @@ Usage
 -----

 * Enable the firewall using the switch in the action bar
-* Allow/deny WiFi/mobile internet access using the icons along the right side of the application list
+* Allow/deny Wi-Fi/mobile internet access using the icons along the right side of the application list

 Permissions
 -----------

-* ACCESS_NETWORK_STATE: to check if the device is connected to the internet through WiFi
+* ACCESS_NETWORK_STATE: to check if the device is connected to the internet through Wi-Fi
 * RECEIVE_BOOT_COMPLETED: to start the firewall when booting the device
 * WAKE_LOCK: to reliably reload rules in the background on connectivity changes
 * com.android.vending.BILLING: to accept donations via in-app billing
@ -81,7 +81,7 @@ Tethering will not work when NetGuard is enabled due to a bug in Android ([issue
 Unfortunately this cannot be worked around.

 [Greenifying](https://play.google.com/store/apps/details?id=com.oasisfeng.greenify) NetGuard will result in rules not being applied
-when connectivity changes from WiFi/mobile, screen on/off, and roaming/not roaming.
+when connectivity changes from Wi-Fi/mobile, screen on/off, and roaming/not roaming.

 Frequently Asked Questions (FAQ)
 --------------------------------
@ -96,7 +96,7 @@ The firewall can only start when Android "allows" it to start,
 so it will not offer protection during early boot-up (although your network may not be loaded at that time).
 It will, however, be much better than nothing, especially if you are not rebooting often.

-If you want to protect yourself more, you can (at least in theory) disable WiFi and mobile data before rebooting,
+If you want to protect yourself more, you can (at least in theory) disable Wi-Fi and mobile data before rebooting,
 and only enable them on reboot, after the firewall service has started (and the small key icon is visible in the status bar).

 Thanks @[pulser](https://github.com/pulser/)
@ -160,7 +160,7 @@ but once you close it, it will not use any bandwidth.
 <a name="FAQ9"></a>
 **(9) Why is the VPN service being restart?**

-The VPN service will be restarted when you turn the screen on or off and when connectivity changes (WiFi, mobile)
+The VPN service will be restarted when you turn the screen on or off and when connectivity changes (Wi-Fi, mobile)
 to apply the rules with the conditions '*Allow when screen is on*' and '*Block when roaming*'.

 <a name="FAQ10"></a>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -17,7 +17,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_whitelist_other">حظر الشبكة بشكل افتراضي</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Block roaming by default</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Manage system applications</string>
    <string name="setting_dark">استخدام الثيم الداكن</string>
    <string name="setting_export">Export settings</string>
@ -25,7 +25,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">هل أنت متأكد؟</string>
    <string name="msg_started">Enforcing rules</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -16,7 +16,7 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt
    <string name="setting_whitelist_other">Mobilfunk standardmäßig blockieren</string>
    <string name="setting_unused">Standardmäßig erlauben, wenn Bildschirm an</string>
    <string name="setting_whitelist_roaming">Roaming standardmäßig blockieren</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">System-Apps anzeigen</string>
    <string name="setting_dark">Dunkles Thema verwenden</string>
    <string name="setting_export">Einstellungen exportieren</string>
@ -24,7 +24,7 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Regeln für System-Apps definieren (für Experten)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Sind Sie sicher?</string>
    <string name="msg_started">Regeln werden angewendet</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -17,7 +17,7 @@ Esto es causado por errores en Android, o por el software proporcionado por el f
    <string name="setting_whitelist_other">Bloquear red móvil por defecto</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Bloquear roaming por defecto</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Administrar aplicaciones de sistema</string>
    <string name="setting_dark">Usar tema oscuro</string>
    <string name="setting_export">Exportar configuración</string>
@ -25,7 +25,7 @@ Esto es causado por errores en Android, o por el software proporcionado por el f
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Definir reglas para aplicaciones de sistema (para expertos)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">¿Estás seguro?</string>
    <string name="msg_started">Aplicando reglas</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -17,7 +17,7 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con
    <string name="setting_whitelist_other">Blocage données mobiles par défaut</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Blocage roaming par défaut</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Gérer les applications système</string>
    <string name="setting_dark">Utiliser le thème sombre</string>
    <string name="setting_export">Exporter paramètres</string>
@ -25,7 +25,7 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Definisé les regeles pour les applications du système (Pour experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Etes-vous sûr ?</string>
    <string name="msg_started">Enforcing rules</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -18,7 +18,7 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
    <string name="setting_whitelist_other">Blocca rete dati di default</string>
    <string name="setting_unused">Permetti di default quando lo schermo è acceso</string>
    <string name="setting_whitelist_roaming">Blocca roaming di default</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Gestisci applicazioni di sistema</string>
    <string name="setting_dark">Usa il tema scuro</string>
    <string name="setting_export">Esporta impostazioni</string>
@ -26,7 +26,7 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Definisci regole per le applicazioni di sistema (solo per esperti)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Sei sicuro?</string>
    <string name="msg_started">Regole applicate</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -17,7 +17,7 @@
    <string name="setting_whitelist_other">デフォルトでモバイル通信をブロック</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">デフォルトでローミングをブロック</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">システムアプリケーションの管理</string>
    <string name="setting_dark">ダークテーマを使用する</string>
    <string name="setting_export">設定をエクスポート</string>
@ -28,7 +28,7 @@
    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>

    <string name="summary_system">システムアプリケーションのルールを定義します (エキスパート向け)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">よろしいですか?</string>
    <string name="msg_started">Enforcing rules</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -17,7 +17,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_whitelist_other">모바일 데이터 차단을 기본 설정으로</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Block roaming by default</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Manage system applications</string>
    <string name="setting_dark">어두운 테마 사용</string>
    <string name="setting_export">Export settings</string>
@ -25,7 +25,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">계속 하시겠습니까?</string>
    <string name="msg_started">Enforcing rules</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -17,7 +17,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_whitelist_other">Blokkeer standaard mobiel</string>
    <string name="setting_unused">Sta standaard toe als scherm aan is</string>
    <string name="setting_whitelist_roaming">Blokkeer standaard roaming</string>
-    <string name="setting_metered">Behandel gemeten WiFi netwerken</string>
+    <string name="setting_metered">Behandel gemeten Wi-Fi netwerken</string>
    <string name="setting_system">Beheer systeemapplicaties</string>
    <string name="setting_dark">Gebruik donker thema</string>
    <string name="setting_export">Exporteer instellingen</string>
@ -25,7 +25,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_technical">Technische informatie</string>

    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Weet u het zeker?</string>
    <string name="msg_started">Regels worden afgedwongen</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -17,7 +17,7 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos
    <string name="setting_whitelist_other">Domyślnie blokuj Mobilne</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Domyślnie blokuj Roaming</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Zarządzaj aplikacjami systemowymi</string>
    <string name="setting_dark">Użyj ciemnej skórki</string>
    <string name="setting_export">Eksport ustawień</string>
@ -25,7 +25,7 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Stwórz reguły dla aplikacji systemowych(zaawansowane)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Na pewno?</string>
    <string name="msg_started">Wymuś Reguły</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -15,7 +15,7 @@
    <string name="setting_whitelist_other">Блокировать моб. сеть по умолч.</string>
    <string name="setting_unused">Разрешить сети, когда экран включен, по умолч.</string>
    <string name="setting_whitelist_roaming">Блокировать роуминг по умолч.</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Управлять сист. приложениями</string>
    <string name="setting_dark">Использовать темную тему</string>
    <string name="setting_export">Экспорт настроек</string>
@ -23,7 +23,7 @@
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Определить правила для системных приложений (для профи)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Вы уверены?</string>
    <string name="msg_started">Определить правила</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -17,7 +17,7 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p
    <string name="setting_whitelist_other">Predvolene blokovať mobilné dáta</string>
    <string name="setting_unused">Predvolene povoliť pri zapnutej obrazovke</string>
    <string name="setting_whitelist_roaming">Predvolene blokovať roaming</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Spravovať systémové aplikácie</string>
    <string name="setting_dark">Použiť tmavú tému</string>
    <string name="setting_export">Exportovať nastavenia</string>
@ -25,7 +25,7 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Určiť pravidlá pre systémové pravidlá (pre expertov)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Ste si istý?</string>
    <string name="msg_started">Pravidlá vynútenia</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -13,7 +13,7 @@
    <string name="setting_whitelist_other">Блокувати типово у мобільній мережі</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Блокувати типово у роумінгу</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Керувати системними додатками</string>
    <string name="setting_dark">Використовувати темну тему</string>
    <string name="setting_export">Експорт налаштувань</string>
@ -21,7 +21,7 @@
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Визначити правила для системних додатків (для експертів)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Ви впевнені?</string>
    <string name="msg_started">Визначити правила</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -17,7 +17,7 @@
    <string name="setting_whitelist_other">默认阻止移动网络</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">默认阻止漫游</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">管理系统应用</string>
    <string name="setting_dark">使用暗色主题</string>
    <string name="setting_export">导出设置</string>
@ -25,7 +25,7 @@
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">定义系统应用规则, 仅供专业用户</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">是否确认?</string>
    <string name="msg_started">规则加载中</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -18,7 +18,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_whitelist_other">Block mobile by default</string>
    <string name="setting_unused">Default allow when screen is on</string>
    <string name="setting_whitelist_roaming">Block roaming by default</string>
-    <string name="setting_metered">Handle metered WiFi networks</string>
+    <string name="setting_metered">Handle metered Wi-Fi networks</string>
    <string name="setting_system">Manage system applications</string>
    <string name="setting_dark">Use dark theme</string>
    <string name="setting_export">Export settings</string>
@ -26,7 +26,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
    <string name="setting_technical">Technical information</string>

    <string name="summary_system">Define rules for system applications (for experts)</string>
-    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>
+    <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>

    <string name="msg_sure">Are you sure?</string>
    <string name="msg_started">Enforcing rules</string>