diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/dialog_decrypt_keys.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/status_network_info_fragment.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/menu_base.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/menu_start.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/menu_status.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-ja/strings.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/values-nb-rNO/strings.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 68 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rHK/strings.xml | 68 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rTW/strings.xml | 68 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 144 |
11 files changed, 177 insertions, 235 deletions
diff --git a/app/src/main/res/layout/dialog_decrypt_keys.xml b/app/src/main/res/layout/dialog_decrypt_keys.xml index 146f5ba..8f49d87 100644 --- a/app/src/main/res/layout/dialog_decrypt_keys.xml +++ b/app/src/main/res/layout/dialog_decrypt_keys.xml | |||
@@ -31,7 +31,7 @@ | |||
31 | android:id="@+id/passphrase" | 31 | android:id="@+id/passphrase" |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="match_parent" | 33 | android:layout_height="match_parent" |
34 | android:hint="@string/field_passphrase" | 34 | android:hint="@string/decrypt_key_modal_field_passphrase" |
35 | android:inputType="textPassword"/> | 35 | android:inputType="textPassword"/> |
36 | 36 | ||
37 | </LinearLayout> | 37 | </LinearLayout> |
diff --git a/app/src/main/res/layout/status_network_info_fragment.xml b/app/src/main/res/layout/status_network_info_fragment.xml index 1013470..0b50839 100644 --- a/app/src/main/res/layout/status_network_info_fragment.xml +++ b/app/src/main/res/layout/status_network_info_fragment.xml | |||
@@ -131,7 +131,7 @@ | |||
131 | 131 | ||
132 | <TextView | 132 | <TextView |
133 | style="@style/AppTheme.BlockContent" | 133 | style="@style/AppTheme.BlockContent" |
134 | android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_yes_value : @string/status_network_info_no_value}" | 134 | android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_value_yes : @string/status_network_info_value_no}" |
135 | android:textIsSelectable="true"/> | 135 | android:textIsSelectable="true"/> |
136 | 136 | ||
137 | </LinearLayout> | 137 | </LinearLayout> |
diff --git a/app/src/main/res/menu/menu_base.xml b/app/src/main/res/menu/menu_base.xml index 4a39baf..703f7c2 100644 --- a/app/src/main/res/menu/menu_base.xml +++ b/app/src/main/res/menu/menu_base.xml | |||
@@ -28,7 +28,7 @@ | |||
28 | android:icon="@drawable/ic_help_primary_24dp" | 28 | android:icon="@drawable/ic_help_primary_24dp" |
29 | android:onClick="aboutDialog" | 29 | android:onClick="aboutDialog" |
30 | android:tint="@color/textAccent" | 30 | android:tint="@color/textAccent" |
31 | android:title="@string/menu_about" | 31 | android:title="@string/about_app_menu_about" |
32 | app:showAsAction="ifRoom"/> | 32 | app:showAsAction="ifRoom"/> |
33 | 33 | ||
34 | </menu> | 34 | </menu> |
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml index 311c36a..c764258 100644 --- a/app/src/main/res/menu/menu_start.xml +++ b/app/src/main/res/menu/menu_start.xml | |||
@@ -28,7 +28,7 @@ | |||
28 | android:icon="@drawable/ic_build_primary_24dp" | 28 | android:icon="@drawable/ic_build_primary_24dp" |
29 | android:onClick="openConfigureActivity" | 29 | android:onClick="openConfigureActivity" |
30 | android:tint="@color/textAccent" | 30 | android:tint="@color/textAccent" |
31 | android:title="@string/menu_configure" | 31 | android:title="@string/start_activity_menu_configure" |
32 | app:showAsAction="ifRoom"/> | 32 | app:showAsAction="ifRoom"/> |
33 | 33 | ||
34 | </menu> | 34 | </menu> |
diff --git a/app/src/main/res/menu/menu_status.xml b/app/src/main/res/menu/menu_status.xml index a6ad5bf..5585783 100644 --- a/app/src/main/res/menu/menu_status.xml +++ b/app/src/main/res/menu/menu_status.xml | |||
@@ -28,7 +28,7 @@ | |||
28 | android:icon="@drawable/ic_link_off_primary_24dp" | 28 | android:icon="@drawable/ic_link_off_primary_24dp" |
29 | android:onClick="stopVpn" | 29 | android:onClick="stopVpn" |
30 | android:tint="@color/textAccent" | 30 | android:tint="@color/textAccent" |
31 | android:title="@string/menu_disconnect" | 31 | android:title="@string/status_activity_menu_disconnect" |
32 | app:showAsAction="ifRoom"/> | 32 | app:showAsAction="ifRoom"/> |
33 | 33 | ||
34 | <item | 34 | <item |
@@ -36,7 +36,7 @@ | |||
36 | android:icon="@drawable/ic_receipt_primary_24dp" | 36 | android:icon="@drawable/ic_receipt_primary_24dp" |
37 | android:onClick="openLogViewer" | 37 | android:onClick="openLogViewer" |
38 | android:tint="@color/textAccent" | 38 | android:tint="@color/textAccent" |
39 | android:title="@string/menu_show_log" | 39 | android:title="@string/status_activity_menu_show_log" |
40 | app:showAsAction="ifRoom"/> | 40 | app:showAsAction="ifRoom"/> |
41 | 41 | ||
42 | </menu> | 42 | </menu> |
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 38a2c6c..134a012 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml | |||
@@ -20,24 +20,14 @@ | |||
20 | --> | 20 | --> |
21 | 21 | ||
22 | <resources> | 22 | <resources> |
23 | <string name="app_name">Tinc App</string> | 23 | <string name="about_app_short_desc">tinc mesh VPN デーモン用の Android バインディングとユーザーインターフェース。</string> |
24 | <string name="app_label">Tinc</string> | 24 | <string name="about_app_license">GNU General Public License v3 の条件で配布されるソフトウェア。</string> |
25 | <string name="app_short_desc">tinc mesh VPN デーモン用の Android バインディングとユーザーインターフェース。</string> | 25 | <string name="about_app_version_format">アプリバージョン %1$s (%2$s ビルド)</string> |
26 | <string name="app_copyright">Copyright © 2017–2018 Pacien TRAN-GIRARD.</string> <!-- TODO: add "and contributors" --> | 26 | <string name="about_app_running_on_format">Android %1$s %2$s で実行中</string> |
27 | <string name="app_license">GNU General Public License v3 の条件で配布されるソフトウェア。</string> | 27 | <string name="about_app_supported_abis_format">デバイス ABI: %1$s</string> |
28 | <string name="app_website_url">https://tincapp.pacien.org</string> | 28 | <string name="about_app_menu_about">このアプリについて</string> |
29 | |||
30 | <string name="info_version_format">アプリバージョン %1$s (%2$s ビルド)</string> | ||
31 | <string name="info_running_on_format">Android %1$s %2$s で実行中</string> | ||
32 | <string name="info_supported_abis_format">デバイス ABI: %1$s</string> | ||
33 | |||
34 | <string name="menu_about">このアプリについて</string> | ||
35 | |||
36 | <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string> | 29 | <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string> |
37 | |||
38 | <string name="start_network_list_title">ネットワークに接続</string> | 30 | <string name="start_network_list_title">ネットワークに接続</string> |
39 | <string name="title_request_vpn_permissions">VPN 権限のリクエスト</string> | 31 | <string name="generic_action_close">閉じる</string> |
40 | 32 | <string name="about_app_open_project_website">プロジェクト Web サイト</string> | |
41 | <string name="action_close">閉じる</string> | ||
42 | <string name="action_open_project_website">プロジェクト Web サイト</string> | ||
43 | </resources> | 33 | </resources> |
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 074e3a0..0f9985d 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml | |||
@@ -20,24 +20,14 @@ | |||
20 | --> | 20 | --> |
21 | 21 | ||
22 | <resources> | 22 | <resources> |
23 | <string name="app_name">Tinc-app</string> | 23 | <string name="about_app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string> |
24 | <string name="app_label">Tinc</string> | 24 | <string name="about_app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string> |
25 | <string name="app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string> | 25 | <string name="about_app_version_format">Programversjon %1$s (%2$s build)</string> |
26 | <string name="app_copyright">Opphavsrett © 2017–2018 Pacien TRAN-GIRARD.</string> <!-- TODO: add "and contributors" --> | 26 | <string name="about_app_running_on_format">Kjører på Android %1$s %2$s</string> |
27 | <string name="app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string> | 27 | <string name="about_app_supported_abis_format">Enhets-binærkompabilitet: %1$s</string> |
28 | <string name="app_website_url">https://tincapp.pacien.org</string> | 28 | <string name="about_app_menu_about">Om</string> |
29 | |||
30 | <string name="info_version_format">Programversjon %1$s (%2$s build)</string> | ||
31 | <string name="info_running_on_format">Kjører på Android %1$s %2$s</string> | ||
32 | <string name="info_supported_abis_format">Enhets-binærkompabilitet: %1$s</string> | ||
33 | |||
34 | <string name="menu_about">Om</string> | ||
35 | |||
36 | <string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string> | 29 | <string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string> |
37 | |||
38 | <string name="start_network_list_title">Koble til nettverk</string> | 30 | <string name="start_network_list_title">Koble til nettverk</string> |
39 | <string name="title_request_vpn_permissions">Forespør VPN-tilganger</string> | 31 | <string name="generic_action_close">Lukk</string> |
40 | 32 | <string name="about_app_open_project_website">Prosjektets nettside</string> | |
41 | <string name="action_close">Lukk</string> | ||
42 | <string name="action_open_project_website">Prosjektets nettside</string> | ||
43 | </resources> | 33 | </resources> |
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 34039ef..f6e1eda 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml | |||
@@ -20,32 +20,22 @@ | |||
20 | --> | 20 | --> |
21 | 21 | ||
22 | <resources> | 22 | <resources> |
23 | <string name="app_name">Tinc App</string> | 23 | <string name="about_app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string> |
24 | <string name="app_label">Tinc</string> | 24 | <string name="about_app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string> |
25 | <string name="app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string> | 25 | <string name="about_app_version_format">应用程序版本 %1$s(%2$s build)</string> |
26 | <string name="app_copyright">版权所有 © 2017–2018 Pacien TRAN-GIRARD。</string> <!-- TODO: add "and contributors" --> | 26 | <string name="about_app_running_on_format">于 Android %1$s %2$s 上运行</string> |
27 | <string name="app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string> | 27 | <string name="about_app_supported_abis_format">设备 ABI:%1$s</string> |
28 | <string name="app_website_url">https://tincapp.pacien.org</string> | 28 | <string name="about_app_menu_about">关于此应用</string> |
29 | <string name="app_doc_url_format">https://tincapp.pacien.org/doc.html#%1$s</string> | 29 | <string name="start_activity_menu_configure">配置</string> |
30 | 30 | <string name="status_activity_menu_disconnect">断开连接</string> | |
31 | <string name="info_version_format">应用程序版本 %1$s(%2$s build)</string> | ||
32 | <string name="info_running_on_format">于 Android %1$s %2$s 上运行</string> | ||
33 | <string name="info_supported_abis_format">设备 ABI:%1$s</string> | ||
34 | |||
35 | <string name="menu_about">关于此应用</string> | ||
36 | <string name="menu_configure">配置</string> | ||
37 | <string name="menu_disconnect">断开连接</string> | ||
38 | |||
39 | <string name="configure_tools_generate_config_net_name_hint">Tinc 网络名称</string> | 31 | <string name="configure_tools_generate_config_net_name_hint">Tinc 网络名称</string> |
40 | <string name="configure_tools_generate_config_node_name_hint">此节点名称</string> | 32 | <string name="configure_tools_generate_config_node_name_hint">此节点名称</string> |
41 | <string name="configure_tools_join_network_field_invitation_url_hint">邀请 URL</string> | 33 | <string name="configure_tools_join_network_field_invitation_url_hint">邀请 URL</string> |
42 | <string name="configure_tools_private_key_encryption_current_passphrase">当前密码\n(没有则为空)</string> | 34 | <string name="configure_tools_private_key_encryption_current_passphrase">当前密码\n(没有则为空)</string> |
43 | <string name="configure_tools_private_key_encryption_new_passphrase">新密码\n(空白以解密)</string> | 35 | <string name="configure_tools_private_key_encryption_new_passphrase">新密码\n(空白以解密)</string> |
44 | <string name="configure_tools_generate_config_optional_passphrase_hint">密码(可选)</string> | 36 | <string name="configure_tools_generate_config_optional_passphrase_hint">密码(可选)</string> |