aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/page_configure.xml4
-rw-r--r--app/src/main/res/values/strings.xml10
2 files changed, 12 insertions, 2 deletions
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
index 35a7416..ab1033e 100644
--- a/app/src/main/res/layout/page_configure.xml
+++ b/app/src/main/res/layout/page_configure.xml
@@ -63,7 +63,7 @@
63 63
64 <LinearLayout 64 <LinearLayout
65 style="@style/AppTheme.ListBlock.Clickable" 65 style="@style/AppTheme.ListBlock.Clickable"
66 android:onClick="generateConf"> 66 android:onClick="openGenerateConfDialog">
67 67
68 <TextView 68 <TextView
69 style="@style/AppTheme.BlockTitle" 69 style="@style/AppTheme.BlockTitle"
@@ -73,7 +73,7 @@
73 73
74 <LinearLayout 74 <LinearLayout
75 style="@style/AppTheme.ListBlock.Clickable" 75 style="@style/AppTheme.ListBlock.Clickable"
76 android:onClick="joinNetwork"> 76 android:onClick="openJoinNetworkDialog">
77 77
78 <TextView 78 <TextView
79 style="@style/AppTheme.BlockTitle" 79 style="@style/AppTheme.BlockTitle"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b4be51..1bb6192 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
15 <string name="menu_disconnect">Disconnect</string> 15 <string name="menu_disconnect">Disconnect</string>
16 16
17 <string name="field_net_name">Tinc network name</string> 17 <string name="field_net_name">Tinc network name</string>
18 <string name="field_invitation_url">Invitation URL</string>
18 19
19 <string name="title_connect_to_network">Connect to network</string> 20 <string name="title_connect_to_network">Connect to network</string>
20 <string name="title_request_vpn_permissions">Request VPN permissions</string> 21 <string name="title_request_vpn_permissions">Request VPN permissions</string>
@@ -34,14 +35,23 @@
34 <string name="title_disallowed_applications">Disallowed applications</string> 35 <string name="title_disallowed_applications">Disallowed applications</string>
35 <string name="title_allow_bypass">Allow bypass</string> 36 <string name="title_allow_bypass">Allow bypass</string>
36 <string name="title_nodes">Nodes</string> 37 <string name="title_nodes">Nodes</string>
38 <string name="title_error">Error</string>
39 <string name="title_new_network">New network</string>
40 <string name="title_join_network">Join network</string>
37 41
38 <string name="action_close">Close</string> 42 <string name="action_close">Close</string>
43 <string name="action_cancel">Cancel</string>
39 <string name="action_open_project_website">Project website</string> 44 <string name="action_open_project_website">Project website</string>
40 <string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string> 45 <string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
41 <string name="action_join_network_via_invitation_url">Join network via invitation URL</string> 46 <string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
47 <string name="action_create">Create</string>
48 <string name="action_join">Join</string>
42 49
43 <string name="message_no_network_configuration_found">No network configuration has been found.</string> 50 <string name="message_no_network_configuration_found">No network configuration has been found.</string>
44 <string name="message_no_known_node">No known node</string> 51 <string name="message_no_known_node">No known node</string>
52 <string name="message_generating_configuration">Generating node configuration…</string>
53 <string name="message_joining_network">Joining network…</string>
54 <string name="message_network_configuration_created">Network configuration successfully created.</string>
45 55
46 <string name="value_none">none</string> 56 <string name="value_none">none</string>
47 <string name="value_yes">yes</string> 57 <string name="value_yes">yes</string>