aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-08 13:29:21 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-08 13:29:21 +0200
commit8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f (patch)
treefebc3e161e3e6728054bff963edc4410cf1baf47 /src/main/res/menu
parentefdf3b6c1ca0fe807781a2e974d42f8853599f9b (diff)
renamed multi-end / axolotl to OMEMO
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 1b3fe76e..9af2cd34 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