From 12b62adeca59e0f6dc2c04331fd65244dfc809f8 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 11 Sep 2014 16:22:33 +0200
Subject: added missing strings back. + formating

---
 res/menu/attachment_choices.xml |  9 +++++----
 res/menu/choose_contact.xml     |  1 +
 res/menu/contact_details.xml    | 16 ++++++++--------
 res/menu/encryption_choices.xml | 29 ++++++++++++++---------------
 res/menu/manageaccounts.xml     | 13 ++++++++-----
 res/menu/muc_details.xml        | 12 ++++++------
 res/menu/start_conversation.xml |  2 --
 7 files changed, 42 insertions(+), 40 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml
index 6a4f295a..20932489 100644
--- a/res/menu/attachment_choices.xml
+++ b/res/menu/attachment_choices.xml
@@ -7,8 +7,9 @@
     <item
         android:id="@+id/attach_take_picture"
         android:title="@string/attach_take_picture"/>
-	<item
-	    android:id="@+id/attach_record_voice"
-	    android:title="@string/attach_record_voice"
-	    android:visible="false"/>
+    <item
+        android:id="@+id/attach_record_voice"
+        android:title="@string/attach_record_voice"
+        android:visible="false"/>
+
 </menu>
\ No newline at end of file
diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml
index 3f402664..e39091b3 100644
--- a/res/menu/choose_contact.xml
+++ b/res/menu/choose_contact.xml
@@ -7,4 +7,5 @@
         android:icon="@drawable/ic_action_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
+
 </menu>
\ No newline at end of file
diff --git a/res/menu/contact_details.xml b/res/menu/contact_details.xml
index 43e8ea6a..02f2e813 100644
--- a/res/menu/contact_details.xml
+++ b/res/menu/contact_details.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <item
         android:id="@+id/action_edit_contact"
+        android:icon="@drawable/ic_action_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_edit"
-        android:title="@string/action_edit_contact" />
+        android:title="@string/action_edit_contact"/>
     <item
         android:id="@+id/action_delete_contact"
+        android:icon="@drawable/ic_action_discard"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_discard"
-        android:title="@string/action_delete_contact" />
+        android:title="@string/action_delete_contact"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
         android:showAsAction="never"
-        android:title="@string/action_accounts"
-	/>
-        
+        android:title="@string/action_accounts"/>
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/encryption_choices.xml b/res/menu/encryption_choices.xml
index 0596bfbc..adf0ad8d 100644
--- a/res/menu/encryption_choices.xml
+++ b/res/menu/encryption_choices.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-     <group android:checkableBehavior="single">
-    
-<item
-    android:id="@+id/encryption_choice_none"
-    android:title="@string/encryption_choice_none"
-    />
-<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"/>
-</group>
-</menu>
+
+    <group android:checkableBehavior="single" >
+        <item
+            android:id="@+id/encryption_choice_none"
+            android:title="@string/encryption_choice_none"/>
+        <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"/>
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/manageaccounts.xml b/res/menu/manageaccounts.xml
index 1d81ba3c..b5cd9b50 100644
--- a/res/menu/manageaccounts.xml
+++ b/res/menu/manageaccounts.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/action_add_account"
+
+    <item
+        android:id="@+id/action_add_account"
+        android:icon="@drawable/ic_action_add_person"
         android:showAsAction="always"
-        android:title="@string/action_add_account"
-        android:icon="@drawable/ic_action_add_person"/>
- <item
+        android:title="@string/action_add_account"/>
+    <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml
index 685109cd..97369098 100644
--- a/res/menu/muc_details.xml
+++ b/res/menu/muc_details.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <item
         android:id="@+id/action_edit_subject"
+        android:icon="@drawable/ic_action_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_edit"
-        android:title="@string/action_edit_subject" />
+        android:title="@string/action_edit_subject"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
         android:showAsAction="never"
-        android:title="@string/action_accounts"
-	/>
-        
+        android:title="@string/action_accounts"/>
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 271bac18..f7230169 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -7,7 +7,6 @@
         android:icon="@drawable/ic_action_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
-    
     <item
         android:id="@+id/action_create_contact"
         android:icon="@drawable/ic_action_add_person"
@@ -18,7 +17,6 @@
         android:icon="@drawable/ic_action_add_group"
         android:showAsAction="always"
         android:title="@string/join_conference"/>
-    
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3