From 0a7f8f489625d90b8969f112d80059d6757d5e8d Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 9 Aug 2018 00:09:39 +0200
Subject: Refactor configuration activity

---
 app/src/main/res/layout/configure_activity.xml     |  53 +++++++++
 ...configure_tools_dialog_encrypt_decrypt_keys.xml |  51 +++++++++
 .../configure_tools_dialog_network_generate.xml    |  51 +++++++++
 .../layout/configure_tools_dialog_network_join.xml |  78 +++++++++++++
 .../main/res/layout/configure_tools_fragment.xml   |  73 +++++++++++++
 .../layout/configure_tools_path_info_fragment.xml  |  74 +++++++++++++
 .../res/layout/dialog_encrypt_decrypt_keys.xml     |  51 ---------
 .../main/res/layout/dialog_network_generate.xml    |  51 ---------
 app/src/main/res/layout/dialog_network_join.xml    |  66 -----------
 app/src/main/res/layout/page_configure.xml         | 121 ---------------------
 app/src/main/res/values-ja/strings.xml             |   2 +-
 app/src/main/res/values-nb-rNO/strings.xml         |   2 +-
 app/src/main/res/values-zh-rCN/strings.xml         |  48 ++++----
 app/src/main/res/values-zh-rHK/strings.xml         |  48 ++++----
 app/src/main/res/values-zh-rTW/strings.xml         |  48 ++++----
 app/src/main/res/values/strings.xml                |  55 ++++++----
 16 files changed, 485 insertions(+), 387 deletions(-)
 create mode 100644 app/src/main/res/layout/configure_activity.xml
 create mode 100644 app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml
 create mode 100644 app/src/main/res/layout/configure_tools_dialog_network_generate.xml
 create mode 100644 app/src/main/res/layout/configure_tools_dialog_network_join.xml
 create mode 100644 app/src/main/res/layout/configure_tools_fragment.xml
 create mode 100644 app/src/main/res/layout/configure_tools_path_info_fragment.xml
 delete mode 100644 app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
 delete mode 100644 app/src/main/res/layout/dialog_network_generate.xml
 delete mode 100644 app/src/main/res/layout/dialog_network_join.xml
 delete mode 100644 app/src/main/res/layout/page_configure.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
new file mode 100644
index 0000000..6097384
--- /dev/null
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<TextView
+			style="@style/AppTheme.SectionTitle"
+			android:text="@string/configure_activity_title_path_info"/>
+
+		<fragment
+			android:id="@+id/configure_activity_path_info_fragment"
+			android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<TextView
+			style="@style/AppTheme.SectionTitle"
+			android:text="@string/configure_activity_title_tools"/>
+
+		<fragment
+			android:id="@+id/configure_activity_tools_fragment"
+			android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+	</LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml
new file mode 100644
index 0000000..1e8e64a
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/dialog_vertical_margin"
+							android:paddingLeft="@dimen/dialog_horizontal_margin"
+							android:paddingRight="@dimen/dialog_horizontal_margin"
+							android:paddingTop="@dimen/dialog_vertical_margin">
+
+	<EditText
+		android:id="@+id/enc_dec_net_name"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/configure_tools_generate_config_net_name_hint"
+		android:inputType="text"/>
+
+	<EditText
+		android:id="@+id/enc_dec_current_passphrase"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/configure_tools_private_key_encryption_current_passphrase"
+		android:inputType="textVisiblePassword"/>
+
+	<EditText
+		android:id="@+id/enc_dec_new_passphrase"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/configure_tools_private_key_encryption_new_passphrase"
+		android:inputType="textVisiblePassword"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/configure_tools_dialog_network_generate.xml b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml
new file mode 100644
index 0000000..614cc16
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:paddingBottom="@dimen/dialog_vertical_margin"
+							android:paddingLeft="@dimen/dialog_horizontal_margin"
+							android:paddingRight="@dimen/dialog_horizontal_margin"
+							android:paddingTop="@dimen/dialog_vertical_margin">
+
+	<EditText
+		android:id="@+id/new_net_name"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/configure_tools_generate_config_net_name_hint"
+		android:inputType="text"/>
+
+	<EditText
+		android:id="@+id/new_node_name"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/configure_tools_generate_config_node_name_hint"
+		android:inputType="text"/>
+
+	<EditText
+		android:id="@+id/new_passphrase"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/configure_tools_generate_config_optional_passphrase_hint"
+		android:inputType="textVisiblePassword"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/configure_tools_dialog_network_join.xml b/app/src/main/res/layout/configure_tools_dialog_network_join.xml
new file mode 100644
index 0000000..9171284
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_dialog_network_join.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<data>
+
+		<variable
+			name="scanAction"
+			type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
+
+	</data>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingBottom="@dimen/dialog_vertical_margin"
+		android:paddingLeft="@dimen/dialog_horizontal_margin"
+		android:paddingRight="@dimen/dialog_horizontal_margin"
+		android:paddingTop="@dimen/dialog_vertical_margin">
+
+		<EditText
+			android:id="@+id/net_name"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="@string/configure_tools_generate_config_net_name_hint"
+			android:inputType="text"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="horizontal">
+
+			<EditText
+				android:id="@+id/invitation_url"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:hint="@string/configure_tools_join_network_field_invitation_url_hint"
+				android:inputType="textUri"/>
+
+			<ImageButton
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:contentDescription="@string/configure_tools_join_network_action_scan_qr_code_action"
+				android:onClick="@{() -> scanAction.invoke()}"
+				android:src="@drawable/ic_photo_camera_primary_24dp"/>
+
+		</LinearLayout>
+
+		<EditText
+			android:id="@+id/join_passphrase"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:hint="@string/configure_tools_generate_config_optional_passphrase_hint"
+			android:inputType="textVisiblePassword"/>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/configure_tools_fragment.xml b/app/src/main/res/layout/configure_tools_fragment.xml
new file mode 100644
index 0000000..bb67b45
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_fragment.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<data>
+
+		<variable
+			name="generateConfigAction"
+			type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/> <!-- '<' escaping: https://stackoverflow.com/q/40970686 -->
+
+		<variable
+			name="joinNetworkAction"
+			type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
+
+		<variable
+			name="encryptDecryptPrivateKeysAction"
+			type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
+
+	</data>
+
+	<LinearLayout style="@style/AppTheme.List">
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock.Clickable"
+			android:onClick="@{() -> generateConfigAction.invoke()}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_tools_action_generate_node_configuration_and_keys"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock.Clickable"
+			android:onClick="@{() -> joinNetworkAction.invoke()}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_tools_action_join_network_via_invitation_url"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock.Clickable"
+			android:onClick="@{() -> encryptDecryptPrivateKeysAction.invoke()}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_tools_action_encrypt_decrypt_private_keys"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/configure_tools_path_info_fragment.xml b/app/src/main/res/layout/configure_tools_path_info_fragment.xml
new file mode 100644
index 0000000..376fa3d
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_path_info_fragment.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<data>
+
+		<variable
+			name="appPaths"
+			type="org.pacien.tincapp.context.AppPaths"/>
+
+	</data>
+
+	<LinearLayout style="@style/AppTheme.List">
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_path_info_title_configuration_directory"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{appPaths.confDir().absolutePath}"
+				android:textIsSelectable="true"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_path_info_title_log_directory"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{appPaths.cacheDir().absolutePath}"
+				android:textIsSelectable="true"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_path_info_title_tinc_binary"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{appPaths.tinc().absolutePath}"
+				android:textIsSelectable="true"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
deleted file mode 100644
index 47433e4..0000000
--- a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical"
-							android:paddingBottom="@dimen/dialog_vertical_margin"
-							android:paddingLeft="@dimen/dialog_horizontal_margin"
-							android:paddingRight="@dimen/dialog_horizontal_margin"
-							android:paddingTop="@dimen/dialog_vertical_margin">
-
-	<EditText
-		android:id="@+id/enc_dec_net_name"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:hint="@string/field_net_name"
-		android:inputType="text"/>
-
-	<EditText
-		android:id="@+id/enc_dec_current_passphrase"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_current_passphrase"
-		android:inputType="textVisiblePassword"/>
-
-	<EditText
-		android:id="@+id/enc_dec_new_passphrase"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_new_passphrase"
-		android:inputType="textVisiblePassword"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_generate.xml b/app/src/main/res/layout/dialog_network_generate.xml
deleted file mode 100644
index 5e3d42c..0000000
--- a/app/src/main/res/layout/dialog_network_generate.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical"
-							android:paddingBottom="@dimen/dialog_vertical_margin"
-							android:paddingLeft="@dimen/dialog_horizontal_margin"
-							android:paddingRight="@dimen/dialog_horizontal_margin"
-							android:paddingTop="@dimen/dialog_vertical_margin">
-
-	<EditText
-		android:id="@+id/new_net_name"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_net_name"
-		android:inputType="text"/>
-
-	<EditText
-		android:id="@+id/new_node_name"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_node_name"
-		android:inputType="text"/>
-
-	<EditText
-		android:id="@+id/new_passphrase"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_optional_passphrase"
-		android:inputType="textVisiblePassword"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_join.xml b/app/src/main/res/layout/dialog_network_join.xml
deleted file mode 100644
index 65d772d..0000000
--- a/app/src/main/res/layout/dialog_network_join.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical"
-							android:paddingBottom="@dimen/dialog_vertical_margin"
-							android:paddingLeft="@dimen/dialog_horizontal_margin"
-							android:paddingRight="@dimen/dialog_horizontal_margin"
-							android:paddingTop="@dimen/dialog_vertical_margin">
-
-	<EditText
-		android:id="@+id/net_name"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:hint="@string/field_net_name"
-		android:inputType="text"/>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<EditText
-			android:id="@+id/invitation_url"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:hint="@string/field_invitation_url"
-			android:inputType="textUri"/>
-
-		<ImageButton
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:contentDescription="@string/action_scan_qr_code"
-			android:onClick="scanCode"
-			android:src="@drawable/ic_photo_camera_primary_24dp"/>
-
-	</LinearLayout>
-
-	<EditText
-		android:id="@+id/join_passphrase"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:hint="@string/field_optional_passphrase"
-		android:inputType="textVisiblePassword"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
deleted file mode 100644
index c86ff76..0000000
--- a/app/src/main/res/layout/page_configure.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<LinearLayout
-		android:id="@+id/page_configure"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		tools:context="org.pacien.tincapp.activities.ConfigureActivity">
-
-		<TextView
-			style="@style/AppTheme.SectionTitle"
-			android:text="@string/title_path_info"/>
-
-		<LinearLayout style="@style/AppTheme.List">
-
-			<LinearLayout style="@style/AppTheme.ListBlock">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/title_configuration_directory"/>
-
-				<TextView
-					android:id="@+id/text_configuration_directory"
-					style="@style/AppTheme.BlockContent"
-					android:textIsSelectable="true"/>
-
-			</LinearLayout>
-
-			<LinearLayout style="@style/AppTheme.ListBlock">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/title_log_directory"/>
-
-				<TextView
-					android:id="@+id/text_log_directory"
-					style="@style/AppTheme.BlockContent"
-					android:textIsSelectable="true"/>
-
-			</LinearLayout>
-
-			<LinearLayout style="@style/AppTheme.ListBlock">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/title_tinc_binary"/>
-
-				<TextView
-					android:id="@+id/text_tinc_binary"
-					style="@style/AppTheme.BlockContent"
-					android:textIsSelectable="true"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-		<TextView
-			style="@style/AppTheme.SectionTitle"
-			android:text="@string/title_tools"/>
-
-		<LinearLayout style="@style/AppTheme.List">
-
-			<LinearLayout
-				style="@style/AppTheme.ListBlock.Clickable"
-				android:onClick="openGenerateConfDialog">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/action_generate_node_configuration_and_keys"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				style="@style/AppTheme.ListBlock.Clickable"
-				android:onClick="openJoinNetworkDialog">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/action_join_network_via_invitation_url"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				style="@style/AppTheme.ListBlock.Clickable"
-				android:onClick="openEncryptDecryptPrivateKeyDialog">
-
-				<TextView
-					style="@style/AppTheme.BlockTitle"
-					android:text="@string/action_encrypt_decrypt_private_keys"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</ScrollView>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3e5b26a..4d6cc80 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -32,7 +32,7 @@
 
 	<string name="menu_about">このアプリについて</string>
 
-	<string name="field_net_name">Tinc ネットワーク名</string>
+	<string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string>
 
 	<string name="title_connect_to_network">ネットワークに接続</string>
 	<string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 7a3bb01..4952beb 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -32,7 +32,7 @@
 
 	<string name="menu_about">Om</string>
 
-	<string name="field_net_name">Tinc-nettverksnavn</string>
+	<string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string>
 
 	<string name="title_connect_to_network">Koble til nettverk</string>
 	<string name="title_request_vpn_permissions">Forespør VPN-tilganger</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d684517..35e39a2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,22 +35,22 @@
 	<string name="menu_configure">配置</string>
 	<string name="menu_disconnect">断开连接</string>
 
-	<string name="field_net_name">Tinc 网络名称</string>
-	<string name="field_node_name">此节点名称</string>
-	<string name="field_invitation_url">邀请 URL</string>
-	<string name="field_current_passphrase">当前密码\n（没有则为空）</string>
-	<string name="field_new_passphrase">新密码\n（空白以解密）</string>
-	<string name="field_optional_passphrase">密码（可选）</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="title_connect_to_network">连接到网络</string>
 	<string name="title_request_vpn_permissions">请求 VPN 权限</string>
-	<string name="title_path_info">路径信息</string>
+	<string name="configure_activity_title_path_info">路径信息</string>
 	<string name="title_node_info">节点信息</string>
-	<string name="title_tools">工具</string>
-	<string name="title_configuration_directory">配置目录</string>
-	<string name="title_log_directory">日志目录</string>
-	<string name="title_tinc_binary">Tinc 二进制文件</string>
+	<string name="configure_activity_title_tools">工具</string>
+	<string name="configure_path_info_title_configuration_directory">配置目录</string>
+	<string name="configure_path_info_title_log_directory">日志目录</string>
+	<string name="configure_path_info_title_tinc_binary">Tinc 二进制文件</string>
 	<string name="title_network_info">网络信息</string>
 	<string name="title_network_name">网络名称</string>
 	<string name="title_ip_addresses">IP 地址</string>
@@ -62,35 +62,35 @@
 	<string name="title_allow_bypass">允许旁路</string>
 	<string name="title_nodes">节点</string>
 	<string name="title_error">错误</string>
-	<string name="title_new_network">新建网络</string>
-	<string name="title_join_network">加入网络</string>
+	<string name="configure_tools_generate_config_title">新建网络</string>
+	<string name="configure_tools_join_network_title">加入网络</string>
 	<string name="title_unable_to_start_tinc">无法启动 tinc</string>
-	<string name="title_private_keys_encryption">私钥加密</string>
+	<string name="configure_tools_private_keys_encryption_title">私钥加密</string>
 	<string name="title_unlock_private_keys">解锁 tinc 私钥</string>
 
 	<string name="action_close">关闭</string>
 	<string name="action_cancel">取消</string>
 	<string name="action_open_project_website">项目网站</string>
-	<string name="action_generate_node_configuration_and_keys">生成节点配置和密钥</string>
-	<string name="action_join_network_via_invitation_url">通过邀请 URL 加入网络</string>
-	<string name="action_create">创建</string>
-	<string name="action_join">加入</string>
+	<string name="configure_tools_action_generate_node_configuration_and_keys">生成节点配置和密钥</string>
+	<string name="configure_tools_action_join_network_via_invitation_url">通过邀请 URL 加入网络</string>
+	<string name="configure_tools_generate_config_action">创建</string>
+	<string name="configure_tools_join_network_action">加入</string>
 	<string name="action_open_manual">打开手册</string>
-	<string name="action_scan_qr_code">扫描 QR 码</string>
+	<string name="configure_tools_join_network_action_scan_qr_code_action">扫描 QR 码</string>
 	<string name="action_install">安装</string>
 	<string name="action_unlock">解锁</string>
-	<string name="action_apply">应用</string>
-	<string name="action_encrypt_decrypt_private_keys">加密或解密私钥</string>
+	<string name="configure_tools_private_keys_encryption_action">应用</string>
+	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私钥</string>
 
 	<string name="message_no_network_configuration_found">未找到网络配置。</string>
-	<string name="message_generating_configuration">生成节点配置…</string>
-	<string name="message_joining_network">加入网络…</string>
+	<string name="configure_tools_generate_config_generating">生成节点配置…</string>
+	<string name="configure_tools_join_network_joining">加入网络…</string>
 	<string name="message_network_configuration_written">网络配置写入成功。</string>
 	<string name="message_no_network_name_provided">没有提供网络名称。</string>
 	<string name="message_no_configuration_for_network_format">没有找到网络“%1$s”的配置。</string>
 	<string name="message_network_config_not_found_format">在“%1$s”找不到网络配置文件。</string>
 	<string name="message_network_config_invalid_format">network.conf 中的网络配置无效：\n%1$s</string>
-	<string name="message_encrypting_decrypting_private_keys">加密/解密私钥</string>
+	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私钥</string>
 	<string name="message_could_not_decrypt_private_keys_format">无法解密私钥：\n%1$s</string>
 
 	<string name="value_none">无</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 2636aa2..c56e1ab 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -35,22 +35,22 @@
 	<string name="menu_configure">配置</string>
 	<string name="menu_disconnect">斷開連接</string>
 
-	<string name="field_net_name">Tinc 網絡名稱</string>
-	<string name="field_node_name">此節點名稱</string>
-	<string name="field_invitation_url">邀請 URL</string>
-	<string name="field_current_passphrase">當前密碼\n（沒有則為空）</string>
-	<string name="field_new_passphrase">新密碼\n（空白以解密）</string>
-	<string name="field_optional_passphrase">密碼（可選）</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="title_connect_to_network">連接到網絡</string>
 	<string name="title_request_vpn_permissions">請求 VPN 權限</string>
-	<string name="title_path_info">路徑信息</string>
+	<string name="configure_activity_title_path_info">路徑信息</string>
 	<string name="title_node_info">節點信息</string>
-	<string name="title_tools">工具</string>
-	<string name="title_configuration_directory">配置目錄</string>
-	<string name="title_log_directory">日誌目錄</string>
-	<string name="title_tinc_binary">Tinc 二進制文件</string>
+	<string name="configure_activity_title_tools">工具</string>
+	<string name="configure_path_info_title_configuration_directory">配置目錄</string>
+	<string name="configure_path_info_title_log_directory">日誌目錄</string>
+	<string name="configure_path_info_title_tinc_binary">Tinc 二進制文件</string>
 	<string name="title_network_info">網絡信息</string>
 	<string name="title_network_name">網絡名稱</string>
 	<string name="title_ip_addresses">IP 地址</string>
@@ -62,35 +62,35 @@
 	<string name="title_allow_bypass">允許旁路</string>
 	<string name="title_nodes">節點</string>
 	<string name="title_error">錯誤</string>
-	<string name="title_new_network">新建網絡</string>
-	<string name="title_join_network">加入網絡</string>
+	<string name="configure_tools_generate_config_title">新建網絡</string>
+	<string name="configure_tools_join_network_title">加入網絡</string>
 	<string name="title_unable_to_start_tinc">無法啟動 tinc</string>
-	<string name="title_private_keys_encryption">私鑰加密</string>
+	<string name="configure_tools_private_keys_encryption_title">私鑰加密</string>
 	<string name="title_unlock_private_keys">解鎖 tinc 私鑰</string>
 
 	<string name="action_close">關閉</string>
 	<string name="action_cancel">取消</string>
 	<string name="action_open_project_website">項目網站</string>
-	<string name="action_generate_node_configuration_and_keys">生成節點配置和密鑰</string>
-	<string name="action_join_network_via_invitation_url">通過邀請 URL 加入網絡</string>
-	<string name="action_create">創建</string>
-	<string name="action_join">加入</string>
+	<string name="configure_tools_action_generate_node_configuration_and_keys">生成節點配置和密鑰</string>
+	<string name="configure_tools_action_join_network_via_invitation_url">通過邀請 URL 加入網絡</string>
+	<string name="configure_tools_generate_config_action">創建</string>
+	<string name="configure_tools_join_network_action">加入</string>
 	<string name="action_open_manual">打開手冊</string>
-	<string name="action_scan_qr_code">掃描 QR 碼</string>
+	<string name="configure_tools_join_network_action_scan_qr_code_action">掃描 QR 碼</string>
 	<string name="action_install">安裝</string>
 	<string name="action_unlock">解鎖</string>
-	<string name="action_apply">應用</string>
-	<string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
+	<string name="configure_tools_private_keys_encryption_action">應用</string>
+	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
 	<string name="message_no_network_configuration_found">未找到網絡配置。</string>
-	<string name="message_generating_configuration">生成節點配置…</string>
-	<string name="message_joining_network">加入網絡…</string>
+	<string name="configure_tools_generate_config_generating">生成節點配置…</string>
+	<string name="configure_tools_join_network_joining">加入網絡…</string>
 	<string name="message_network_configuration_written">網絡配置寫入成功。</string>
 	<string name="message_no_network_name_provided">沒有提供網絡名稱。</string>
 	<string name="message_no_configuration_for_network_format">沒有找到網絡“%1$s”的配置。</string>
 	<string name="message_network_config_not_found_format">在“%1$s”找不到網絡配置文件。</string>
 	<string name="message_network_config_invalid_format">network.conf 中的網絡配置無效：\n%1$s</string>
-	<string name="message_encrypting_decrypting_private_keys">加密/解密私鑰</string>
+	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私鑰</string>
 	<string name="message_could_not_decrypt_private_keys_format">無法解密私鑰：\n%1$s</string>
 
 	<string name="value_none">無</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 297e551..b110498 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,22 +35,22 @@
 	<string name="menu_configure">配置</string>
 	<string name="menu_disconnect">斷開連線</string>
 
-	<string name="field_net_name">Tinc 網路名稱</string>
-	<string name="field_node_name">此節點名稱</string>
-	<string name="field_invitation_url">邀請 URL</string>
-	<string name="field_current_passphrase">當前密碼\n（沒有則為空）</string>
-	<string name="field_new_passphrase">新密碼\n（空白以解密）</string>
-	<string name="field_optional_passphrase">密碼（可選）</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="title_connect_to_network">連線到網路</string>
 	<string name="title_request_vpn_permissions">請求 VPN 許可權</string>
-	<string name="title_path_info">路徑資訊</string>
+	<string name="configure_activity_title_path_info">路徑資訊</string>
 	<string name="title_node_info">節點資訊</string>
-	<string name="title_tools">工具</string>
-	<string name="title_configuration_directory">配置目錄</string>
-	<string name="title_log_directory">日誌目錄</string>
-	<string name="title_tinc_binary">Tinc 二進位制檔案</string>
+	<string name="configure_activity_title_tools">工具</string>
+	<string name="configure_path_info_title_configuration_directory">配置目錄</string>
+	<string name="configure_path_info_title_log_directory">日誌目錄</string>
+	<string name="configure_path_info_title_tinc_binary">Tinc 二進位制檔案</string>
 	<string name="title_network_info">網路資訊</string>
 	<string name="title_network_name">網路名稱</string>
 	<string name="title_ip_addresses">IP 地址</string>
@@ -62,35 +62,35 @@
 	<string name="title_allow_bypass">允許旁路</string>
 	<string name="title_nodes">節點</string>
 	<string name="title_error">錯誤</string>
-	<string name="title_new_network">新建網路</string>
-	<string name="title_join_network">加入網路</string>
+	<string name="configure_tools_generate_config_title">新建網路</string>
+	<string name="configure_tools_join_network_title">加入網路</string>
 	<string name="title_unable_to_start_tinc">無法啟動 tinc</string>
-	<string name="title_private_keys_encryption">私鑰加密</string>
+	<string name="configure_tools_private_keys_encryption_title">私鑰加密</string>
 	<string name="title_unlock_private_keys">解鎖 tinc 私鑰</string>
 
 	<string name="action_close">關閉</string>
 	<string name="action_cancel">取消</string>
 	<string name="action_open_project_website">專案網站</string>
-	<string name="action_generate_node_configuration_and_keys">生成節點配置和金鑰</string>
-	<string name="action_join_network_via_invitation_url">通過邀請 URL 加入網路</string>
-	<string name="action_create">建立</string>
-	<string name="action_join">加入</string>
+	<string name="configure_tools_action_generate_node_configuration_and_keys">生成節點配置和金鑰</string>
+	<string name="configure_tools_action_join_network_via_invitation_url">通過邀請 URL 加入網路</string>
+	<string name="configure_tools_generate_config_action">建立</string>
+	<string name="configure_tools_join_network_action">加入</string>
 	<string name="action_open_manual">開啟手冊</string>
-	<string name="action_scan_qr_code">掃描 QR 碼</string>
+	<string name="configure_tools_join_network_action_scan_qr_code_action">掃描 QR 碼</string>
 	<string name="action_install">安裝</string>
 	<string name="action_unlock">解鎖</string>
-	<string name="action_apply">應用</string>
-	<string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
+	<string name="configure_tools_private_keys_encryption_action">應用</string>
+	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
 	<string name="message_no_network_configuration_found">未找到網路配置。</string>
-	<string name="message_generating_configuration">生成節點配置…</string>
-	<string name="message_joining_network">加入網路…</string>
+	<string name="configure_tools_generate_config_generating">生成節點配置…</string>
+	<string name="configure_tools_join_network_joining">加入網路…</string>
 	<string name="message_network_configuration_written">網路配置寫入成功。</string>
 	<string name="message_no_network_name_provided">沒有提供網路名稱。</string>
 	<string name="message_no_configuration_for_network_format">沒有找到網路“%1$s”的配置。</string>
 	<string name="message_network_config_not_found_format">在“%1$s”找不到網路配置檔案。</string>
 	<string name="message_network_config_invalid_format">network.conf 中的網路配置無效：\n%1$s</string>
-	<string name="message_encrypting_decrypting_private_keys">加密/解密私鑰</string>
+	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私鑰</string>
 	<string name="message_could_not_decrypt_private_keys_format">無法解密私鑰：\n%1$s</string>
 
 	<string name="value_none">無</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6899082..fc689fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,22 +41,11 @@
 	<string name="menu_toggle_logging">Toggle logging</string>
 	<string name="menu_share_log">Share log</string>
 
-	<string name="field_net_name">Tinc network name</string>
-	<string name="field_node_name">Name of this node</string>
-	<string name="field_invitation_url">Invitation URL</string>
-	<string name="field_current_passphrase">Current passphrase\n(leave empty if none)</string>
-	<string name="field_new_passphrase">New passphrase\n(leave empty to decrypt)</string>
-	<string name="field_optional_passphrase">Passphrase (optional)</string>
 	<string name="field_passphrase">Passphrase</string>
 
 	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
-	<string name="title_path_info">Path info</string>
 	<string name="title_node_info">Node info</string>
-	<string name="title_tools">Tools</string>
-	<string name="title_configuration_directory">Configuration directory</string>
-	<string name="title_log_directory">Log directory</string>
-	<string name="title_tinc_binary">Tinc binary</string>
 	<string name="title_network_info">Network info</string>
 	<string name="title_network_name">Network name</string>
 	<string name="title_ip_addresses">IP addresses</string>
@@ -68,40 +57,28 @@
 	<string name="title_allow_bypass">Allow bypass</string>
 	<string name="title_nodes">Nodes</string>
 	<string name="title_error">Error</string>
-	<string name="title_new_network">New network</string>
-	<string name="title_join_network">Join network</string>
 	<string name="title_unable_to_start_tinc">Unable to start tinc</string>
-	<string name="title_private_keys_encryption">Private keys encryption</string>
 	<string name="title_unlock_private_keys">Unlock tinc private keys</string>
 	<string name="title_app_crash">App crash</string>
 
 	<string name="action_close">Close</string>
 	<string name="action_cancel">Cancel</string>
 	<string name="action_open_project_website">Project website</string>
-	<string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
-	<string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
-	<string name="action_create">Create</string>
-	<string name="action_join">Join</string>
 	<string name="action_open_manual">Open manual</string>
-	<string name="action_scan_qr_code">Scan QR code</string>
 	<string name="action_install">Install</string>
 	<string name="action_unlock">Unlock</string>
-	<string name="action_apply">Apply</string>
-	<string name="action_encrypt_decrypt_private_keys">Encrypt or decrypt private keys</string>
+
 	<string name="action_dismiss">Dismiss</string>
 	<string name="action_open_web_page">Open web page</string>
 	<string name="action_send_email">Send e-mail</string>
 	<string name="action_send_report">Send report</string>
 
 	<string name="message_no_network_configuration_found">No network configuration has been found.</string>
-	<string name="message_generating_configuration">Generating node configuration…</string>
-	<string name="message_joining_network">Joining network…</string>
 	<string name="message_network_configuration_written">Network configuration successfully written.</string>
 	<string name="message_no_network_name_provided">No network name has been provided.</string>
 	<string name="message_no_configuration_for_network_format">No configuration has been found for network \"%1$s\".</string>
 	<string name="message_network_config_not_found_format">Network configuration file not found at \"%1$s\".</string>
 	<string name="message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string>
-	<string name="message_encrypting_decrypting_private_keys">Encrypting/decrypting private keys</string>
 	<string name="message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string>
 	<string name="message_storage_unavailable">Storage directory is unavailable.</string>
 	<string name="message_starting_vpn">Starting VPN…</string>
@@ -123,4 +100,34 @@
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
 	<string name="value_no">no</string>
+
+	<!-- Configure activity -->
+	<string name="configure_activity_title_path_info">Path info</string>
+	<string name="configure_path_info_title_configuration_directory">Configuration directory</string>
+	<string name="configure_path_info_title_log_directory">Log directory</string>
+	<string name="configure_path_info_title_tinc_binary">Tinc binary</string>
+
+	<string name="configure_activity_title_tools">Tools</string>
+	<string name="configure_tools_action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
+	<string name="configure_tools_action_join_network_via_invitation_url">Join network via invitation URL</string>
+	<string name="configure_tools_action_encrypt_decrypt_private_keys">Encrypt or decrypt private keys</string>
+
+	<string name="configure_tools_generate_config_title">New network</string>
+	<string name="configure_tools_generate_config_net_name_hint">Tinc network name</string>
+	<string name="configure_tools_generate_config_node_name_hint">Name of this node</string>
+	<string name="configure_tools_generate_config_optional_passphrase_hint">Passphrase (optional)</string>
+	<string name="configure_tools_generate_config_action">Create</string>
+	<string name="configure_tools_generate_config_generating">Generating node configuration…</string>
+
+	<string name="configure_tools_join_network_title">Join network</string>
+	<string name="configure_tools_join_network_field_invitation_url_hint">Invitation URL</string>
+	<string name="configure_tools_join_network_action_scan_qr_code_action">Scan QR code</string>
+	<string name="configure_tools_join_network_action">Join</string>
+	<string name="configure_tools_join_network_joining">Joining network…</string>
+
+	<string name="configure_tools_private_keys_encryption_title">Private keys encryption</string>
+	<string name="configure_tools_private_key_encryption_current_passphrase">Current passphrase\n(leave empty if none)</string>
+	<string name="configure_tools_private_key_encryption_new_passphrase">New passphrase\n(leave empty to decrypt)</string>
+	<string name="configure_tools_private_keys_encryption_action">Apply</string>
+	<string name="configure_tools_private_keys_encryption_encrypting">Encrypting/decrypting private keys</string>
 </resources>
-- 
cgit v1.2.3