aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
committerChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
commita0145e779d3caf58b0bfdb6a76587c61b345bf55 (patch)
tree619423e3139836b9ad78dc472e7a6592b0d015ba /src/main/res/menu
parent6ef1f090840eec062f23c3433eaeef77df75f874 (diff)
parent81b7e27a468edb37994225fa7ad3581e26f73c9d (diff)
version 1.6.0 beta 3
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/encryption_choices.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 1b3fe76ef..9af2cd346 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -6,14 +6,14 @@
android:id="@+id/encryption_choice_none"
android:title="@string/encryption_choice_none"/>
<item
+ android:id="@+id/encryption_choice_axolotl"
+ android:title="@string/encryption_choice_omemo"/>
+ <item
android:id="@+id/encryption_choice_otr"
android:title="@string/encryption_choice_otr"/>
<item
android:id="@+id/encryption_choice_pgp"
android:title="@string/encryption_choice_pgp"/>
- <item
- android:id="@+id/encryption_choice_axolotl"
- android:title="@string/encryption_choice_axolotl"/>
</group>
</menu> \ No newline at end of file