aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2017-07-03 22:33:51 +0200
committerPacien TRAN-GIRARD2017-07-03 22:33:51 +0200
commit7dfc7b2fb2fb1006bf210ea6396c6e898e74d40e (patch)
treea0eb66ec7beb9a3c677a72eecc17ce7d9eb3c6ff /app/src/main/res/values
parentab577b06a6eaa9b8dd950b79b658ed8c08eef1c9 (diff)
downloadtincapp-7dfc7b2fb2fb1006bf210ea6396c6e898e74d40e.tar.gz
List configured VPN on startup screen
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml4
2 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0870cb0..750edbb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,10 +25,8 @@
25 25
26 <string name="action_close">Close</string> 26 <string name="action_close">Close</string>
27 <string name="action_open_project_website">Project website</string> 27 <string name="action_open_project_website">Project website</string>
28 <string name="action_connect">Connect</string>
29 <string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string> 28 <string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
30 <string name="action_join_network_via_invitation_url">Join network via invitation URL</string> 29 <string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
31 30
32 <string name="message_vpn_permissions_granted">VPN permissions granted.</string> 31 <string name="message_no_network_configuration_found">No network configuration has been found.</string>
33 <string name="message_vpn_permissions_denied">VPN permissions denied.</string>
34</resources> 32</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9f0eb8e..0b3ed77 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -47,6 +47,10 @@
47 <item name="android:clickable">true</item> 47 <item name="android:clickable">true</item>
48 </style> 48 </style>
49 49
50 <style name="AppTheme.ListBlock.Placeholder">
51 <item name="android:textStyle">italic</item>
52 </style>
53
50 <style name="AppTheme.BlockTitle"> 54 <style name="AppTheme.BlockTitle">
51 <item name="android:layout_width">match_parent</item> 55 <item name="android:layout_width">match_parent</item>
52 <item name="android:layout_height">wrap_content</item> 56 <item name="android:layout_height">wrap_content</item>