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 @@
                 android:id="@+id/passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_passphrase"
+                android:hint="@string/decrypt_key_modal_field_passphrase"
                 android:inputType="textPassword"/>
 
 </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 @@
 
                                 <TextView
                                         style="@style/AppTheme.BlockContent"
-                                        android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_yes_value : @string/status_network_info_no_value}"
+                                        android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_value_yes : @string/status_network_info_value_no}"
                                         android:textIsSelectable="true"/>
 
                         </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 @@
                 android:icon="@drawable/ic_help_primary_24dp"
                 android:onClick="aboutDialog"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_about"
+                android:title="@string/about_app_menu_about"
                 app:showAsAction="ifRoom"/>
 
 </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 @@
                 android:icon="@drawable/ic_build_primary_24dp"
                 android:onClick="openConfigureActivity"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_configure"
+                android:title="@string/start_activity_menu_configure"
                 app:showAsAction="ifRoom"/>
 
 </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 @@
                 android:icon="@drawable/ic_link_off_primary_24dp"
                 android:onClick="stopVpn"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_disconnect"
+                android:title="@string/status_activity_menu_disconnect"
                 app:showAsAction="ifRoom"/>
 
         <item
@@ -36,7 +36,7 @@
                 android:icon="@drawable/ic_receipt_primary_24dp"
                 android:onClick="openLogViewer"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_show_log"
+                android:title="@string/status_activity_menu_show_log"
                 app:showAsAction="ifRoom"/>
 
 </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 @@
 -->
 
 <resources>
-        <string name="app_name">Tinc App</string>
-        <string name="app_label">Tinc</string>
-        <string name="app_short_desc">tinc mesh VPN デーモン用の Android バインディングとユーザーインターフェース。</string>
-        <string name="app_copyright">Copyright © 2017–2018 Pacien TRAN-GIRARD.</string> <!-- TODO: add "and contributors" -->
-        <string name="app_license">GNU General Public License v3 の条件で配布されるソフトウェア。</string>
-        <string name="app_website_url">https://tincapp.pacien.org</string>
-
-        <string name="info_version_format">アプリバージョン %1$s (%2$s ビルド)</string>
-        <string name="info_running_on_format">Android %1$s %2$s で実行中</string>
-        <string name="info_supported_abis_format">デバイス ABI: %1$s</string>
-
-        <string name="menu_about">このアプリについて</string>
-
+        <string name="about_app_short_desc">tinc mesh VPN デーモン用の Android バインディングとユーザーインターフェース。</string>
+        <string name="about_app_license">GNU General Public License v3 の条件で配布されるソフトウェア。</string>
+        <string name="about_app_version_format">アプリバージョン %1$s (%2$s ビルド)</string>
+        <string name="about_app_running_on_format">Android %1$s %2$s で実行中</string>
+        <string name="about_app_supported_abis_format">デバイス ABI: %1$s</string>
+        <string name="about_app_menu_about">このアプリについて</string>
         <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string>
-
         <string name="start_network_list_title">ネットワークに接続</string>
-        <string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
-
-        <string name="action_close">閉じる</string>
-        <string name="action_open_project_website">プロジェクト Web サイト</string>
+        <string name="generic_action_close">閉じる</string>
+        <string name="about_app_open_project_website">プロジェクト Web サイト</string>
 </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 @@
 -->
 
 <resources>
-        <string name="app_name">Tinc-app</string>
-        <string name="app_label">Tinc</string>
-        <string name="app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string>
-        <string name="app_copyright">Opphavsrett © 2017–2018 Pacien TRAN-GIRARD.</string>  <!-- TODO: add "and contributors" -->
-        <string name="app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string>
-        <string name="app_website_url">https://tincapp.pacien.org</string>
-
-        <string name="info_version_format">Programversjon %1$s (%2$s build)</string>
-        <string name="info_running_on_format">Kjører på Android %1$s %2$s</string>
-        <string name="info_supported_abis_format">Enhets-binærkompabilitet: %1$s</string>
-
-        <string name="menu_about">Om</string>
-
+        <string name="about_app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string>
+        <string name="about_app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string>
+        <string name="about_app_version_format">Programversjon %1$s (%2$s build)</string>
+        <string name="about_app_running_on_format">Kjører på Android %1$s %2$s</string>
+        <string name="about_app_supported_abis_format">Enhets-binærkompabilitet: %1$s</string>
+        <string name="about_app_menu_about">Om</string>
         <string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string>
-
         <string name="start_network_list_title">Koble til nettverk</string>
-        <string name="title_request_vpn_permissions">Forespør VPN-tilganger</string>
-
-        <string name="action_close">Lukk</string>
-        <string name="action_open_project_website">Prosjektets nettside</string>
+        <string name="generic_action_close">Lukk</string>
+        <string name="about_app_open_project_website">Prosjektets nettside</string>
 </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 @@
 -->
 
 <resources>
-        <string name="app_name">Tinc App</string>
-        <string name="app_label">Tinc</string>
-        <string name="app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string>
-        <string name="app_copyright">版权所有 © 2017–2018 Pacien TRAN-GIRARD。</string> <!-- TODO: add "and contributors" -->
-        <string name="app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string>
-        <string name="app_website_url">https://tincapp.pacien.org</string>
-        <string name="app_doc_url_format">https://tincapp.pacien.org/doc.html#%1$s</string>
-
-        <string name="info_version_format">应用程序版本 %1$s（%2$s build）</string>
-        <string name="info_running_on_format">于 Android %1$s %2$s 上运行</string>
-        <string name="info_supported_abis_format">设备 ABI：%1$s</string>
-
-        <string name="menu_about">关于此应用</string>
-        <string name="menu_configure">配置</string>
-        <string name="menu_disconnect">断开连接</string>
-
+        <string name="about_app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string>
+        <string name="about_app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string>
+        <string name="about_app_version_format">应用程序版本 %1$s（%2$s build）</string>
+        <string name="about_app_running_on_format">于 Android %1$s %2$s 上运行</string>
+        <string name="about_app_supported_abis_format">设备 ABI：%1$s</string>
+        <string name="about_app_menu_about">关于此应用</string>
+        <string name="start_activity_menu_configure">配置</string>
+        <string name="status_activity_menu_disconnect">断开连接</string>
         <string name="configure_tools_generate_config_net_name_hint">Tinc 网络名称</string>
         <string name="configure_tools_generate_config_node_name_hint">此节点名称</string>
         <string name="configure_tools_join_network_field_invitation_url_hint">邀请 URL</string>
         <string name="configure_tools_private_key_encryption_current_passphrase">当前密码\n（没有则为空）</string>
         <string name="configure_tools_private_key_encryption_new_passphrase">新密码\n（空白以解密）</string>
         <string name="configure_tools_generate_config_optional_passphrase_hint">密码（可选）</string>
-        <string name="field_passphrase">密码</string>
-
+        <string name="decrypt_key_modal_field_passphrase">密码</string>
         <string name="start_network_list_title">连接到网络</string>
-        <string name="title_request_vpn_permissions">请求 VPN 权限</string>