diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
| commit | df9db8c8b61ae090309933a8dff395e690ff9ba3 (patch) | |
| tree | c58a2630c4543fca8aeb191acbfc33c9a999e89f /res/values/arrays.xml | |
| parent | f1c8b0e1b8bb16cceb32b12403166775b639f53a (diff) | |
| parent | a9e34d34926d7df3fb01143d6733b481c31c292d (diff) | |
Merge branch 'development'
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b8135cde..2210fbb8 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <array name="conversation_encryption_type_entries"> - <item>None</item> - <item>OpenPGP</item> - <item>Off the record</item> - </array> - <array name="conversation_encryption_type_values"> - <item>none</item> - <item>pgp</item> - <item>otr</item> - </array> - <array name="manage_account_options"> - <item>Delete</item> - <item>Disable</item> + <array name="resources"> + <item>Mobile</item> + <item>Phone</item> + <item>Tablet</item> + <item>Conversations</item> + <item>Android</item> </array> </resources> |