added missing strings back. + formating

res/drawable/actionbar_tab_indicator.xml

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+
     <!-- Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@android:color/transparent" />
+    <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/tab_selected_conversations" />
+    <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
 
     <!-- Focused states -->
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_focused_conversations" />
+    <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_conversations" />
+    <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
 
     <!-- Pressed -->
     <!-- Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" />
+    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" />
+    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
 
     <!-- Focused states -->
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" />
+    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" />
+    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+
 </selector>

res/drawable/es_slidingpane_shadow.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <gradient
         android:endColor="@color/divider"
         android:startColor="@android:color/transparent" />
-<size android:width="3.0dp" android:height="0.5dp" />
+
+    <size
+        android:height="0.5dp"
+        android:width="3.0dp" />
+
 </shape>

res/drawable/grey.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
+
     <solid android:color="#ffdddddd" />
+
 </shape>

res/drawable/greybackground.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
+
-        android:state_pressed="true"
+    <item android:drawable="@drawable/grey" android:state_pressed="true"/>
-        android:drawable="@drawable/grey" />
+
 </selector>

res/drawable/message_border.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
     <corners android:radius="2dp" />
-  <padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/>
+
+    <padding
+        android:bottom="1.5dp"
+        android:left="1.5dp"
+        android:right="1.5dp"
+        android:top="1.5dp" />
+
     <solid android:color="@color/divider" />
+
 </shape>

res/drawable/section_header.xml

@@ -7,4 +7,5 @@
         android:width="2000dp" />
 
     <solid android:color="@color/divider" />
+
 </shape>

res/drawable/snackbar.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <solid android:color="@color/darkbackground" />
+
     <corners android:radius="8dip" />
-    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+
+    <padding
+        android:bottom="0dip"
+        android:left="0dip"
+        android:right="0dip"
+        android:top="0dip" />
+
 </shape>

res/layout-sw360dp/fragment_conversations_overview.xml

@@ -1,25 +1,24 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent" >
-        android:id="@+id/slidingpanelayout">
+
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="324dp"
         android:layout_height="match_parent"
-    android:orientation="vertical"
         android:background="@color/primarybackground"
-    >
+        android:orientation="vertical" >
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:divider="@color/divider"
-        android:dividerHeight="1dp"
             android:background="@color/primarybackground"
-     />
+            android:divider="@color/divider"
- 
+            android:dividerHeight="1dp" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/selected_conversation"
         android:layout_width="fill_parent"
@@ -27,4 +26,5 @@
         android:layout_weight="1"
         android:orientation="vertical" >
     </LinearLayout>
+
 </android.support.v4.widget.SlidingPaneLayout>

res/layout-sw384dp/fragment_conversations_overview.xml

@@ -1,25 +1,24 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent" >
-        android:id="@+id/slidingpanelayout">
+
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="345dp"
         android:layout_height="match_parent"
-    android:orientation="vertical"
         android:background="@color/primarybackground"
-    >
+        android:orientation="vertical" >
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:divider="@color/divider"
-        android:dividerHeight="1dp"
             android:background="@color/primarybackground"
-     />
+            android:divider="@color/divider"
- 
+            android:dividerHeight="1dp" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/selected_conversation"
         android:layout_width="fill_parent"
@@ -27,4 +26,5 @@
         android:layout_weight="1"
         android:orientation="vertical" >
     </LinearLayout>
+
 </android.support.v4.widget.SlidingPaneLayout>

res/layout-sw600dp/fragment_conversations_overview.xml

@@ -1,25 +1,24 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent" >
-        android:id="@+id/slidingpanelayout">
+
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="240dp"
         android:layout_height="match_parent"
-    android:orientation="vertical"
         android:background="@color/primarybackground"
-    >
+        android:orientation="vertical" >
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:divider="@color/divider"
-        android:dividerHeight="1dp"
             android:background="@color/primarybackground"
-     />
+            android:divider="@color/divider"
- 
+            android:dividerHeight="1dp" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/selected_conversation"
         android:layout_width="fill_parent"
@@ -27,4 +26,5 @@
         android:layout_weight="1"
         android:orientation="vertical" >
     </LinearLayout>
+
 </android.support.v4.widget.SlidingPaneLayout>

res/layout-sw720dp/fragment_conversations_overview.xml

@@ -1,25 +1,24 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent" >
-        android:id="@+id/slidingpanelayout">
+
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="288dp"
         android:layout_height="match_parent"
-    android:orientation="vertical"
         android:background="@color/primarybackground"
-    >
+        android:orientation="vertical" >
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:divider="@color/divider"
-        android:dividerHeight="1dp"
             android:background="@color/primarybackground"
-     />
+            android:divider="@color/divider"
- 
+            android:dividerHeight="1dp" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/selected_conversation"
         android:layout_width="fill_parent"
@@ -27,4 +26,5 @@
         android:layout_weight="1"
         android:orientation="vertical" >
     </LinearLayout>
+
 </android.support.v4.widget.SlidingPaneLayout>

res/layout/account_row.xml

@@ -16,8 +16,8 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/account_image"
         android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/account_image"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
 
@@ -35,8 +35,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textSize="?attr/TextSizeBody"
             android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </LinearLayout>
 

res/layout/activity_contact_details.xml

@@ -16,6 +16,7 @@
             android:padding="8dp"
             android:text="@string/action_contact_details"
             android:textColor="@color/primarytext" />
+
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -44,30 +45,29 @@
                     android:layout_height="wrap_content"
                     android:paddingLeft="8dp"
                     android:singleLine="true"
-                android:textSize="?attr/TextSizeBody"
+                    android:textColor="@color/primarytext"
-                android:textColor="@color/primarytext"/>
+                    android:textSize="?attr/TextSizeBody" />
 
                 <TextView
                     android:id="@+id/details_contactstatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingLeft="16dp"
-                android:textSize="?attr/TextSizeHeadline"
                     android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/details_lastseen"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingLeft="8dp"
                     android:singleLine="true"
-                android:textSize="?attr/TextSizeBody"
+                    android:textColor="@color/primarytext"
-                android:textColor="@color/primarytext"/>
+                    android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
-          
         </RelativeLayout>
 
-  
         <TextView
             style="@style/sectionHeader"
             android:layout_width="wrap_content"
@@ -75,13 +75,15 @@
             android:padding="8dp"
             android:text="@string/your_account"
             android:textColor="@color/primarytext" />
+
         <TextView
             android:id="@+id/details_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="8dp"
-        android:textSize="?attr/TextSizeBody"
+            android:textColor="@color/primarytext"
-        android:textColor="@color/primarytext" />
+            android:textSize="?attr/TextSizeBody" />
+
         <TextView
             style="@style/sectionHeader"
             android:layout_width="wrap_content"
@@ -95,16 +97,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/send_presence_updates"
-        android:textSize="?attr/TextSizeBody"
+            android:textColor="@color/primarytext"
-        android:textColor="@color/primarytext" />
+            android:textSize="?attr/TextSizeBody" />
 
         <CheckBox
             android:id="@+id/details_receive_presence"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/receive_presence_updates"
-        android:textSize="?attr/TextSizeBody"
+            android:textColor="@color/primarytext"
-        android:textColor="@color/primarytext" />
+            android:textSize="?attr/TextSizeBody" />
+
         <TextView
             style="@style/sectionHeader"
             android:layout_width="wrap_content"
@@ -116,10 +119,10 @@
             android:id="@+id/details_contact_keys"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-     android:orientation="vertical"
             android:divider="?android:dividerHorizontal"
+            android:orientation="vertical"
             android:showDividers="middle" >
         </LinearLayout>
-    
     </LinearLayout>
+
 </ScrollView>

res/layout/activity_muc_details.xml

@@ -82,9 +82,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="?android:selectableItemBackground"
-              	android:src="@drawable/ic_action_edit_dark"
+                android:padding="8dp"
-              	android:padding="8dp"/>
+                android:src="@drawable/ic_action_edit_dark" />
-
         </RelativeLayout>
 
         <LinearLayout

res/layout/activity_publish_profile_picture.xml

@@ -77,9 +77,9 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:layout_above="@+id/button_bar"
-        android:layout_below="@+id/secondary_hint"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
+        android:layout_below="@+id/secondary_hint"
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:paddingLeft="8dp"
@@ -94,13 +94,13 @@
 
         <TextView
             android:id="@+id/hint_or_warning"
-            android:layout_marginTop="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:minLines="3"
             android:text="@string/publish_avatar_explanation"
             android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody"
+            android:textSize="?attr/TextSizeBody" />
-            android:minLines="3" />
     </LinearLayout>
 
 </RelativeLayout>

res/layout/contact.xml

@@ -27,8 +27,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textSize="?attr/TextSizeHeadline"
+            android:textColor="@color/primarytext"
-            android:textColor="@color/primarytext" />
+            android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
             android:id="@+id/contact_jid"

res/layout/contact_key.xml

@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:padding="8dp"
         android:background="?android:selectableItemBackground"
+        android:padding="8dp"
         android:src="@drawable/ic_action_remove"
         android:visibility="invisible" />
 

res/layout/conversation_list_row.xml

@@ -4,7 +4,6 @@
     android:orientation="horizontal"
     android:padding="8dp" >
 
-
     <ImageView
         android:id="@+id/conversation_image"
         android:layout_width="56dp"
@@ -13,10 +12,10 @@
         android:scaleType="centerCrop" />
 
     <RelativeLayout
-	    android:layout_toRightOf="@+id/conversation_image"
-	    android:layout_centerVertical="true"
-	    android:layout_height="wrap_content"
         android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/conversation_image"
         android:paddingLeft="8dp" >
 
         <TextView
@@ -26,27 +25,26 @@
             android:layout_alignLeft="@+id/conversation_lastwrapper"
             android:layout_toLeftOf="@+id/conversation_lastupdate"
             android:singleLine="true"
-	        android:textSize="?attr/TextSizeHeadline"
             android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline"
             android:typeface="sans" />
 
         <LinearLayout
-	        android:orientation="vertical"
             android:id="@+id/conversation_lastwrapper"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/conversation_name"
-	        android:paddingTop="3dp"
+            android:orientation="vertical"
-	        >
+            android:paddingTop="3dp" >
+
             <TextView
                 android:id="@+id/conversation_lastmsg"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-	        android:textSize="?attr/TextSizeBody"
-	        android:textColor="@color/primarytext"
-	        android:singleLine="true"
                 android:scrollHorizontally="false"
-	        />
+                android:singleLine="true"
+                android:textColor="@color/primarytext"
+                android:textSize="?attr/TextSizeBody" />
 
             <ImageView
                 android:id="@+id/conversation_lastimage"
@@ -54,8 +52,8 @@
                 android:layout_height="36dp"
                 android:background="@color/primarytext"
                 android:scaleType="centerCrop" />
-
         </LinearLayout>
+
         <TextView
             android:id="@+id/conversation_lastupdate"
             android:layout_width="wrap_content"
@@ -63,10 +61,8 @@
             android:layout_alignBaseline="@+id/conversation_name"
             android:layout_alignParentRight="true"
             android:gravity="right"
-	        android:textSize="?attr/TextSizeInfo"
+            android:textColor="@color/secondarytext"
-	        android:textColor="@color/secondarytext"/>
+            android:textSize="?attr/TextSizeInfo" />
-
     </RelativeLayout>
 
- 
 </RelativeLayout>

res/layout/create_contact_dialog.xml

@@ -9,9 +9,10 @@
         android:id="@+id/your_account"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="?attr/TextSizeBody"
+        android:text="@string/your_account"
         android:textColor="@color/primarytext"
-        android:text="@string/your_account" />
+        android:textSize="?attr/TextSizeBody" />
+
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
@@ -19,20 +20,20 @@
 
     <TextView
         android:id="@+id/jabber_id"
-        android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="?attr/TextSizeBody"
+        android:layout_marginTop="8dp"
+        android:text="@string/account_settings_jabber_id"
         android:textColor="@color/primarytext"
-        android:text="@string/account_settings_jabber_id" />
+        android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
         android:id="@+id/jid"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:inputType="textEmailAddress"
         android:hint="@string/account_settings_example_jabber_id"
-        android:textColorHint="@color/secondarytext"
+        android:inputType="textEmailAddress"
         android:textColor="@color/primarytext"
-        />
+        android:textColorHint="@color/secondarytext" />
+
 </LinearLayout>

res/layout/dialog_clear_history.xml

@@ -4,15 +4,18 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
         android:text="@string/clear_histor_msg"
-        android:textSize="?attr/TextSizeBody"
+        android:textSize="?attr/TextSizeBody" />
-        android:paddingBottom="8dp"/>
+
     <CheckBox
         android:id="@+id/end_conversation_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/also_end_conversation" />
+
 </LinearLayout>

res/layout/dialog_verify_otr.xml

@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="8dp"
     android:paddingBottom="16dp"
+    android:paddingLeft="8dp"
     android:paddingRight="8dp" >
 
     <TextView
@@ -20,8 +20,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
-        android:textSize="?attr/TextSizeBody"
+        android:textColor="@color/secondarytext"
-        android:textColor="@color/secondarytext"/>
+        android:textSize="?attr/TextSizeBody" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,23 +36,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
+        android:textColor="@color/secondarytext"
         android:textSize="?attr/TextSizeBody"
-        android:typeface="monospace"
+        android:typeface="monospace" />
-        android:textColor="@color/secondarytext"/>
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:text="@string/your_fingerprint"
-        android:textSize="?attr/TextSizeHeadline"
+        android:textColor="@color/primarytext"
-        android:textColor="@color/primarytext"/>
+        android:textSize="?attr/TextSizeHeadline" />
 
     <TextView
         android:id="@+id/verify_otr_yourprint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="8dp"
+        android:textColor="@color/secondarytext"
         android:textSize="?attr/TextSizeBody"
-        android:typeface="monospace"
+        android:typeface="monospace" />
-        android:textColor="@color/secondarytext"/>
+
 </LinearLayout>

res/layout/fragment_conversations_overview.xml

@@ -1,25 +1,24 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slidingpanelayout"
     android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent" >
-        android:id="@+id/slidingpanelayout">
+
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="288dp"
         android:layout_height="match_parent"
-    android:orientation="vertical"
         android:background="@color/primarybackground"
-    >
+        android:orientation="vertical" >
 
         <ListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-        android:divider="@color/divider"
-        android:dividerHeight="1dp"
             android:background="@color/primarybackground"
-     />
+            android:divider="@color/divider"
- 
+            android:dividerHeight="1dp" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/selected_conversation"
         android:layout_width="fill_parent"
@@ -27,4 +26,5 @@
         android:layout_weight="1"
         android:orientation="vertical" >
     </LinearLayout>
+
 </android.support.v4.widget.SlidingPaneLayout>

res/layout/join_conference_dialog.xml

@@ -9,9 +9,10 @@
         android:id="@+id/your_account"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="?attr/TextSizeBody"
+        android:text="@string/your_account"
         android:textColor="@color/primarytext"
-        android:text="@string/your_account" />
+        android:textSize="?attr/TextSizeBody" />
+
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
@@ -19,29 +20,28 @@
 
     <TextView
         android:id="@+id/jabber_id"
-        android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="?attr/TextSizeBody"
+        android:layout_marginTop="8dp"
+        android:text="@string/conference_address"
         android:textColor="@color/primarytext"
-        android:text="@string/conference_address" />
+        android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
         android:id="@+id/jid"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:inputType="textEmailAddress"
         android:hint="@string/conference_address_example"
-        android:textColorHint="@color/secondarytext"
+        android:inputType="textEmailAddress"
         android:textColor="@color/primarytext"
-        />
+        android:textColorHint="@color/secondarytext" />
 
     <CheckBox
         android:id="@+id/bookmark"
-        android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/save_as_bookmark"
+        android:layout_marginTop="8dp"
-        android:checked="true" />
+        android:checked="true"
+        android:text="@string/save_as_bookmark" />
 
 </LinearLayout>

res/layout/message_null.xml

@@ -2,4 +2,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content" >
+
 </RelativeLayout>

res/layout/message_status.xml

@@ -3,10 +3,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="6dp"
     android:paddingBottom="6dp"
+    android:paddingLeft="8dp"
     android:paddingRight="6dp"
-    android:paddingLeft="8dp">
+    android:paddingTop="6dp" >
 
     <ImageView
         android:id="@+id/message_photo"

res/layout/quickedit.xml

@@ -4,6 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="16dp" >
+
     <EditText
         android:id="@+id/editor"
         android:layout_width="match_parent"

res/menu/attachment_choices.xml

@@ -11,4 +11,5 @@
         android:id="@+id/attach_record_voice"
         android:title="@string/attach_record_voice"
         android:visible="false"/>
+
 </menu>

res/menu/choose_contact.xml

@@ -7,4 +7,5 @@
         android:icon="@drawable/ic_action_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
+
 </menu>

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"/>
     <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"/>
     <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>

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">
 
+    <group android:checkableBehavior="single" >
         <item
             android:id="@+id/encryption_choice_none"
-    android:title="@string/encryption_choice_none"
+            android:title="@string/encryption_choice_none"/>
-    />
         <item
             android:id="@+id/encryption_choice_otr"
-    android:title="@string/encryption_choice_otr"
+            android:title="@string/encryption_choice_otr"/>
-    />
         <item
             android:id="@+id/encryption_choice_pgp"
             android:title="@string/encryption_choice_pgp"/>
     </group>
+
 </menu>

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:title="@string/action_add_account"/>
-        android:icon="@drawable/ic_action_add_person"/>
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
+
 </menu>

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"/>
     <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>

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"

res/values-ca/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mòbil</item>
         <item>Telèfon</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-ca/strings.xml

@@ -78,5 +78,6 @@
     <string name="pref_advanced_options">Opcions avançades</string>
     <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
     <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
+    <string name="pref_ui_options">Opcions de UI</string>
 
 </resources>

res/values-de/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobile</item>
         <item>Phone</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-de/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">Conversations</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_add">Neue Unterhaltung</string>
@@ -230,4 +231,6 @@
     <string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
     <string name="additional_information">Zusätzliche Informationen</string>
     <string name="skip">Überspringen</string>
+    <string name="pref_ui_options">Benutzeroberfläche</string>
+
 </resources>

res/values-es/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Móvil</item>
         <item>Teléfono</item>
@@ -26,6 +27,7 @@
         <item>8 horas</item>
         <item>Hasta nuevo aviso</item>
     </string-array>
+
     <integer-array name="mute_options_durations">
         <item>1800</item>
         <item>3600</item>
@@ -33,4 +35,5 @@
         <item>28800</item>
         <item>-1</item>
     </integer-array>
+
 </resources>

res/values-es/strings.xml

@@ -254,4 +254,5 @@
     <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
     <string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
     <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
+
 </resources>

res/values-eu/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mugikorra</item>
         <item>Telefonoa</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-eu/strings.xml

@@ -230,5 +230,6 @@
     <string name="server_info_session_established">Uneko saioa ezarri da</string>
     <string name="additional_information">Informazio gehiago</string>
     <string name="skip">Orain ez</string>
+    <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
 
 </resources>

res/values-fr/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobile</item>
         <item>Téléphone</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-fr/strings.xml

@@ -207,5 +207,6 @@
     <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
     <string name="add_back">Ajouter également</string>
     <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
+    <string name="pref_ui_options">Options d\'affichage</string>
 
 </resources>

res/values-gl/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Móvil</item>
         <item>Teléfono</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-gl/strings.xml

@@ -125,4 +125,6 @@
     <string name="save">Gardar</string>
     <string name="passwords_do_not_match">As contrasinais non coinciden</string>
     <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
+    <string name="pref_ui_options">Opcións de interfaz</string>
+
 </resources>

res/values-he/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>נייד</item>
         <item>טלפון</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-he/strings.xml

@@ -219,4 +219,6 @@
     <string name="private_message">בפרטי</string>
     <string name="private_message_to">בפרטי אל %s</string>
     <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
+    <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
+
 </resources>

res/values-nl/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobiel</item>
         <item>Telefoon</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-nl/strings.xml

@@ -178,7 +178,6 @@
     <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
     <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
     <string name="reception_failed">Ontvangen mislukt</string>
-
     <string name="join_conference">Aan groepsconversatie deelnemen</string>
     <string name="invite_contact">Contact uitnodigen</string>
     <string name="your_fingerprint">Uw vingerafdruk</string>
@@ -229,4 +228,6 @@
     <string name="server_info_session_established">Huidige sessie opgezet</string>
     <string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string>
     <string name="server_info_available">beschikbaar</string>
+    <string name="pref_ui_options">UI Opties</string>
+
 </resources>

res/values-ru/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Мобильный</item>
         <item>Телефон</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-ru/strings.xml

@@ -229,5 +229,6 @@
     <string name="save_as_bookmark">Сохранить закладку</string>
     <string name="delete_bookmark">Удалить закладку</string>
     <string name="bookmark_already_exists">Такая закладка уже существует</string>
+    <string name="pref_ui_options">Параметры интерфейса</string>
 
 </resources>

res/values-sv/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobile</item>
         <item>Phone</item>
@@ -19,4 +20,5 @@
         <item>524288</item>
         <item>1048576</item>
     </string-array>
+
 </resources>

res/values-sv/strings.xml

@@ -231,5 +231,6 @@
     <string name="pref_general">Generellt</string>
     <string name="publish">Publicera</string>
     <string name="private_message">privat meddelande</string>
+    <string name="pref_ui_options">UI inställningar</string>
 
 </resources>

res/values/arrays.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="resources">
         <item>Mobile</item>
         <item>Phone</item>
@@ -26,6 +27,7 @@
         <item>8 hours</item>
         <item>until further notice</item>
     </string-array>
+
     <integer-array name="mute_options_durations">
         <item>1800</item>
         <item>3600</item>
@@ -33,4 +35,5 @@
         <item>28800</item>
         <item>-1</item>
     </integer-array>
+
 </resources>

res/values/attrs.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <attr name="TextSizeInfo" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
+
 </resources>