aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-19 23:35:03 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 23:35:03 +0200
commit480b1cde810e0ed2afc6ea424fb36fd973ae24b9 (patch)
tree3811628d5bfac6ac2c0b0c96fb3ebfebbed01531 /src/main/res
parent14010bf5a6198e4e53ba3f86328d061cf20b8da1 (diff)
Add clear devices to overflow menu in EditAccount
Diffstat (limited to '')
-rw-r--r--src/main/res/menu/editaccount.xml4
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 4ce9e1f39..2076805ef 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -20,4 +20,8 @@
<item android:id="@+id/action_change_password_on_server"
android:title="@string/change_password"
android:showAsAction="never" />
+
+ <item android:id="@+id/action_clear_devices"
+ android:title="@string/clear_other_devices"
+ android:showAsAction="never"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8537c1187..0f992884e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -391,6 +391,8 @@
<string name="copy_axolotl_clipboard_description">Copy Axolotl fingerprint to clipboard</string>
<string name="regenerate_axolotl_key">Copy Axolotl fingerprint to clipboard</string>
<string name="wipe_axolotl_pep">Wipe other devices from PEP</string>
+ <string name="clear_other_devices">Clear devices</string>
+ <string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the axolotl announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.</string>
<string name="fetching_history_from_server">Fetching history from server</string>
<string name="no_more_history_on_server">No more history on server</string>
<string name="updating">Updating…</string>