diff options
| author | cyberta <cyberta@riseup.net> | 2023-01-03 14:51:19 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2023-01-03 14:51:19 +0000 |
| commit | 19812279d89166bf89f5d386c3bf93b958db6d31 (patch) | |
| tree | 4b194882238d7eb4ad80729884ba0d1ffe113d24 /app | |
| parent | 11dbd85774f49843227814ab5081096eae25d1c1 (diff) | |
| parent | 2f695932355f3ae338bcb25d37b9269dba31c02a (diff) | |
Merge branch 'prepare_1.1.6' into 'master'
Prepare 1.1.6
See merge request leap/bitmask_android!238
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index a216b041..e7d99127 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n // to extracted bundle apks, supplied by google // however we don't calculate the versionCode here, because F-Droid doesn't like that - versionCode 166000 - versionName "1.1.6RC2" + versionCode 167000 + versionName "1.1.6" minSdkVersion 21 targetSdkVersion 31 vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 564f15f3..9279450d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -67,6 +67,9 @@ <string name="authentication_failed_message">认证失败</string> <string name="registration_failed_message">注册失败</string> <string name="eip_status_start_pending">正在初始化连接</string> + <string name="eip_status_connecting">正在连接 VPN</string> + <string name="eip_status_unsecured">不安全连接</string> + <string name="eip_status_secured">安全连接</string> <string name="eip_cancel_connect_title">取消连接？</string> <string name="eip_cancel_connect_text">尝试连接中。您希望取消吗？</string> <string name="eip.warning.browser_inconsistency">是否关闭 VPN 连接？关闭 VPN 可能会造成向您的互联网提供商或本地网络泄露个人信息的后果。</string> @@ -200,4 +203,6 @@ <string name="disabled_while_udp_on">UDP 开启时禁用。</string> <string name="advanced_settings">高级设置</string> <string name="cancel_connection">中断连接</string> + <string name="unknown_location">未知位置</string> + <string name="splash_footer">由 LEAP 开发</string> </resources> |