diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/menu/menu_conf.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/app/src/main/res/menu/menu_conf.xml b/app/src/main/res/menu/menu_conf.xml deleted file mode 100644 index df81b00..0000000 --- a/app/src/main/res/menu/menu_conf.xml +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | <menu xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | xmlns:app="http://schemas.android.com/apk/res-auto" | ||
3 | xmlns:tools="http://schemas.android.com/tools" | ||
4 | tools:context="org.pacien.tincapp.activities.ConfigureActivity"> | ||
5 | |||
6 | <item | ||
7 | android:id="@+id/menu_open_config_dir" | ||
8 | android:icon="@drawable/ic_folder_primary_24dp" | ||
9 | android:onClick="openConfigDir" | ||
10 | android:tint="@color/colorAccent" | ||
11 | android:title="@string/menu_open_config_dir" | ||
12 | app:showAsAction="ifRoom"/> | ||
13 | |||
14 | </menu> | ||
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da3fa10..cab09ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml | |||
@@ -6,6 +6,7 @@ | |||
6 | <string name="app_license">Software distributed under the terms of the GNU General Public License v3.</string> | 6 | <string name="app_license">Software distributed under the terms of the GNU General Public License v3.</string> |
7 | <string name="app_website_url">http://tincapp.pacien.org</string> | 7 | <string name="app_website_url">http://tincapp.pacien.org</string> |
8 | <string name="app_doc_url_format">http://tincapp.pacien.org/doc.html#%1$s</string> | 8 | <string name="app_doc_url_format">http://tincapp.pacien.org/doc.html#%1$s</string> |
9 | <string name="app_dev_email">pacien.gplayfr@gmail.com</string> | ||
9 | 10 | ||
10 | <string name="info_version_format">App version %1$s (%2$s build)</string> | 11 | <string name="info_version_format">App version %1$s (%2$s build)</string> |
11 | <string name="info_running_on_format">Running on Android %1$s %2$s</string> | 12 | <string name="info_running_on_format">Running on Android %1$s %2$s</string> |
@@ -50,6 +51,7 @@ | |||
50 | <string name="title_unable_to_start_tinc">Unable to start tinc</string> | 51 | <string name="title_unable_to_start_tinc">Unable to start tinc</string> |
51 | <string name="title_private_keys_encryption">Private keys encryption</string> | 52 | <string name="title_private_keys_encryption">Private keys encryption</string> |
52 | <string name="title_unlock_private_keys">Unlock tinc private keys</string> | 53 | <string name="title_unlock_private_keys">Unlock tinc private keys</string> |
54 | <string name="title_app_crash">App crash</string> | ||
53 | 55 | ||
54 | <string name="action_close">Close</string> | 56 | <string name="action_close">Close</string> |
55 | <string name="action_cancel">Cancel</string> | 57 | <string name="action_cancel">Cancel</string> |
@@ -66,6 +68,8 @@ | |||
66 | <string name="action_encrypt_decrypt_private_keys">Encrypt or decrypt private keys</string> | 68 | <string name="action_encrypt_decrypt_private_keys">Encrypt or decrypt private keys</string> |
67 | <string name="action_dismiss">Dismiss</string> | 69 | <string name="action_dismiss">Dismiss</string> |
68 | <string name="action_open_web_page">Open web page</string> | 70 | <string name="action_open_web_page">Open web page</string> |
71 | <string name="action_send_email">Send e-mail</string> | ||
72 | <string name="action_send_report">Send report</string> | ||
69 | 73 | ||
70 | <string name="message_no_network_configuration_found">No network configuration has been found.</string> | 74 | <string name="message_no_network_configuration_found">No network configuration has been found.</string> |
71 | <string name="message_generating_configuration">Generating node configuration…</string> | 75 | <string name="message_generating_configuration">Generating node configuration…</string> |
@@ -89,6 +93,8 @@ | |||
89 | <string name="message_could_not_configure_iface">Could not apply network interface configuration:\n\n%1$s</string> | 93 | <string name="message_could_not_configure_iface">Could not apply network interface configuration:\n\n%1$s</string> |
90 | <string name="message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string> | 94 | <string name="message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string> |
91 | <string name="message_invalid_network_name">Invalid network name.</string> | 95 | <string name="message_invalid_network_name">Invalid network name.</string> |
96 | <string name="message_app_crash">The application has previously encountered a fatal error.</string> | ||
97 | <string name="message_crash_logged">The crash details have been saved in \"%1$s\".</string> | ||
92 | 98 | ||
93 | <string name="value_none">none</string> | 99 | <string name="value_none">none</string> |
94 | <string name="value_yes">yes</string> | 100 | <string name="value_yes">yes</string> |