Detailed changes
@@ -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:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_conversations" />
+ <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
+ <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:state_focused="true" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_conversations" />
+ <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
+ <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:state_focused="false" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" />
+ <!-- Non focused states -->
+ <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
+ <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
+
+ <!-- Focused states -->
+ <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
+ <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" 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:state_focused="true" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" />
- </selector>
+</selector>
@@ -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" />
+
+ <gradient
+ android:endColor="@color/divider"
+ android:startColor="@android:color/transparent" />
+
+ <size
+ android:height="0.5dp"
+ android:width="3.0dp" />
+
</shape>
@@ -1,5 +1,7 @@
<?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" >
+
<solid android:color="#ffdddddd" />
+
</shape>
@@ -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"
- android:drawable="@drawable/grey" />
-</selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@drawable/grey" android:state_pressed="true"/>
+
+</selector>
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
- <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"/>
- <solid android:color="@color/divider"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <corners android:radius="2dp" />
+
+ <padding
+ android:bottom="1.5dp"
+ android:left="1.5dp"
+ android:right="1.5dp"
+ android:top="1.5dp" />
+
+ <solid android:color="@color/divider" />
+
</shape>
@@ -7,4 +7,5 @@
android:width="2000dp" />
<solid android:color="@color/divider" />
+
</shape>
@@ -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" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <solid android:color="@color/darkbackground" />
+
+ <corners android:radius="8dip" />
+
+ <padding
+ android:bottom="0dip"
+ android:left="0dip"
+ android:right="0dip"
+ android:top="0dip" />
+
</shape>
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="324dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<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"
- >
-
- <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"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout>
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="345dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<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"
- >
-
- <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"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout>
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="240dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<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"
- >
-
- <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"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout>
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="288dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<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"
- >
-
- <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"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout>
@@ -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,9 +35,9 @@
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:textStyle="bold"/>
+ android:textSize="?attr/TextSizeBody"
+ android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
@@ -14,6 +14,6 @@
android:layout_height="wrap_content"
android:focusable="true"
android:inputType="textEmailAddress|textNoSuggestions"
- android:textColor="@color/ondarktext"/>
+ android:textColor="@color/ondarktext" />
</LinearLayout>
@@ -2,124 +2,127 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
-<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/action_contact_details"
- android:textColor="@color/primarytext"/>
- <RelativeLayout
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="88dp"
- android:padding="8dp">
+ android:orientation="vertical" >
- <QuickContactBadge
- android:id="@+id/details_contact_badge"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_centerVertical="true"
- android:scaleType="centerCrop"/>
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/action_contact_details"
+ android:textColor="@color/primarytext" />
- <LinearLayout
- android:id="@+id/details_jidbox"
+ <RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/details_contact_badge"
- android:orientation="vertical"
- android:paddingLeft="8dp" >
+ android:minHeight="88dp"
+ android:padding="8dp" >
- <TextView
- android:id="@+id/details_contactjid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:singleLine="true"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext"/>
+ <QuickContactBadge
+ android:id="@+id/details_contact_badge"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_centerVertical="true"
+ android:scaleType="centerCrop" />
- <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:textStyle="bold" />
- <TextView
- android:id="@+id/details_lastseen"
+ <LinearLayout
+ android:id="@+id/details_jidbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:singleLine="true"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext"/>
- </LinearLayout>
-
- </RelativeLayout>
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/details_contact_badge"
+ android:orientation="vertical"
+ android:paddingLeft="8dp" >
-
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- 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" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/subscriptions"
- android:textColor="@color/primarytext"/>
+ <TextView
+ android:id="@+id/details_contactjid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
- <CheckBox
- android:id="@+id/details_send_presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/send_presence_updates"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/primarytext" />
+ <TextView
+ android:id="@+id/details_contactstatus"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ 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:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/subscriptions"
+ android:textColor="@color/primarytext" />
<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" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/keys" />
-
- <LinearLayout
- android:id="@+id/details_contact_keys"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle">
- </LinearLayout>
-
-</LinearLayout>
+ android:id="@+id/details_send_presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/send_presence_updates"
+ 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:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="@string/keys" />
+
+ <LinearLayout
+ android:id="@+id/details_contact_keys"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle" >
+ </LinearLayout>
+ </LinearLayout>
+
</ScrollView>
@@ -24,7 +24,7 @@
android:singleLine="true"
android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader"
@@ -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
@@ -28,7 +28,7 @@
android:layout_centerHorizontal="true"
android:text="@string/touch_to_choose_picture"
android:textColor="@color/secondarytext" />
-
+
<TextView
android:id="@+id/secondary_hint"
android:layout_width="wrap_content"
@@ -77,30 +77,30 @@
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"
android:paddingRight="8dp" >
- <TextView
+ <TextView
android:id="@+id/account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
-
+ android:textSize="?attr/TextSizeHeadline" />
+
<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:minLines="3" />
+ android:textSize="?attr/TextSizeBody" />
</LinearLayout>
</RelativeLayout>
@@ -3,6 +3,6 @@
android:id="@+id/start_conversation_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
</android.support.v4.view.ViewPager>
@@ -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"
@@ -32,9 +32,9 @@
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"/>
+ android:visibility="invisible" />
</RelativeLayout>
@@ -2,71 +2,67 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp">
-
+ android:padding="8dp" >
- <ImageView
- android:id="@+id/conversation_image"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:layout_alignParentLeft="true"
- android:scaleType="centerCrop"/>
+ <ImageView
+ android:id="@+id/conversation_image"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:layout_alignParentLeft="true"
+ 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:paddingLeft="8dp">
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/conversation_image"
+ android:paddingLeft="8dp" >
- <TextView
- android:id="@+id/conversation_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/conversation_lastwrapper"
- android:layout_toLeftOf="@+id/conversation_lastupdate"
- android:singleLine="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textColor="@color/primarytext"
- 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"
- >
- <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"
- />
-
- <ImageView
- android:id="@+id/conversation_lastimage"
- android:layout_width="fill_parent"
- android:layout_height="36dp"
- android:background="@color/primarytext"
- android:scaleType="centerCrop" />
+ <TextView
+ android:id="@+id/conversation_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/conversation_lastwrapper"
+ android:layout_toLeftOf="@+id/conversation_lastupdate"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline"
+ android:typeface="sans" />
- </LinearLayout>
- <TextView
- android:id="@+id/conversation_lastupdate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/conversation_name"
- android:layout_alignParentRight="true"
- android:gravity="right"
- android:textSize="?attr/TextSizeInfo"
- android:textColor="@color/secondarytext"/>
+ <LinearLayout
+ android:id="@+id/conversation_lastwrapper"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/conversation_name"
+ android:orientation="vertical"
+ android:paddingTop="3dp" >
+
+ <TextView
+ android:id="@+id/conversation_lastmsg"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:scrollHorizontally="false"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <ImageView
+ android:id="@+id/conversation_lastimage"
+ android:layout_width="fill_parent"
+ android:layout_height="36dp"
+ android:background="@color/primarytext"
+ android:scaleType="centerCrop" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/conversation_lastupdate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@+id/conversation_name"
+ android:layout_alignParentRight="true"
+ android:gravity="right"
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeInfo" />
+ </RelativeLayout>
- </RelativeLayout>
-
-
</RelativeLayout>
@@ -3,36 +3,37 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
- <TextView
+ <TextView
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"
android:layout_height="wrap_content" />
- <TextView
+ <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"
- />
-</LinearLayout>
+ android:textColorHint="@color/secondarytext" />
+
+</LinearLayout>
@@ -3,16 +3,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ 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:paddingBottom="8dp"/>
+ android:textSize="?attr/TextSizeBody" />
+
<CheckBox
android:id="@+id/end_conversation_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/also_end_conversation"/>
-</LinearLayout>
+ android:text="@string/also_end_conversation" />
+
+</LinearLayout>
@@ -3,55 +3,58 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingLeft="8dp"
android:paddingBottom="16dp"
- android:paddingRight="8dp">
-
- <TextView
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp" >
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Jabber ID"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/verify_otr_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:textSize="?attr/TextSizeBody"
- android:textColor="@color/secondarytext"/>
- <TextView
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/otr_fingerprint"
android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline"/>
+ android:textSize="?attr/TextSizeHeadline" />
<TextView
android:id="@+id/verify_otr_fingerprint"
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:textColor="@color/secondarytext"/>
- <TextView
+ android:typeface="monospace" />
+
+ <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:textColor="@color/secondarytext"/>
-</LinearLayout>
+ android:typeface="monospace" />
+
+</LinearLayout>
@@ -1,30 +1,30 @@
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/slidingpanelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="288dp"
android:layout_height="match_parent"
- android:id="@+id/slidingpanelayout">
-<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"
- >
-
- <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"
- />
-
-</LinearLayout>
-<LinearLayout
- android:id="@+id/selected_conversation"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-</LinearLayout>
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/primarybackground"
+ android:divider="@color/divider"
+ android:dividerHeight="1dp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+ </LinearLayout>
+
</android.support.v4.widget.SlidingPaneLayout>
@@ -3,45 +3,45 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="8dp">
+ android:padding="8dp" >
- <TextView
+ <TextView
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"
android:layout_height="wrap_content" />
- <TextView
+ <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:checked="true" />
+ android:layout_marginTop="8dp"
+ android:checked="true"
+ android:text="@string/save_as_bookmark" />
-</LinearLayout>
+</LinearLayout>
@@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@color/primarybackground">
+ android:background="@color/primarybackground" >
<ListView
android:id="@+id/account_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
- android:dividerHeight="1dp">
+ android:dividerHeight="1dp" >
</ListView>
</LinearLayout>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content" >
+
</RelativeLayout>
@@ -3,11 +3,11 @@
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"
android:layout_width="32dp"
@@ -17,6 +17,6 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"/>
+ android:src="@drawable/ic_profile" />
</RelativeLayout>
@@ -3,16 +3,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="16dp">
+ android:padding="16dp" >
+
<EditText
android:id="@+id/editor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPersonName"
- android:textColor="@color/primarytext">
+ android:textColor="@color/primarytext" >
<requestFocus />
</EditText>
-
-</LinearLayout>
+
+</LinearLayout>
@@ -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>
@@ -7,4 +7,5 @@
android:icon="@drawable/ic_action_search"
android:showAsAction="collapseActionView|always"
android:title="@string/search"/>
+
</menu>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -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>
+
+</resources>
@@ -60,11 +60,11 @@
<string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
<string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
<string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
- <string name="pref_xmpp_resource">Recursos XMPP</string>
+ <string name="pref_xmpp_resource">Recursos XMPP</string>
<string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
- <string name="pref_accept_files">Acceptar fitxers</string>
- <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string>
- <string name="pref_notification_settings">Ajustos de notificacions</string>
+ <string name="pref_accept_files">Acceptar fitxers</string>
+ <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string>
+ <string name="pref_notification_settings">Ajustos de notificacions</string>
<string name="pref_notifications">Notificacions</string>
<string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
<string name="pref_vibrate">Vibra</string>
@@ -77,6 +77,7 @@
<string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
<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>
-
-</resources>
+ <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>
@@ -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>
+
+</resources>
@@ -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>
-</resources>
+ <string name="pref_ui_options">Benutzeroberfläche</string>
+
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+</resources>
@@ -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>
+
+</resources>
@@ -66,9 +66,9 @@
<string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
<string name="pref_xmpp_resource">Recurso</string>
<string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
- <string name="pref_accept_files">Aceptar arquivos</string>
+ <string name="pref_accept_files">Aceptar arquivos</string>
<string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
- <string name="pref_notification_settings">Axustes de notificación</string>
+ <string name="pref_notification_settings">Axustes de notificación</string>
<string name="pref_notifications">Notificacións</string>
<string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
<string name="pref_vibrate">Tremer</string>
@@ -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>
-</resources>
+ <string name="pref_ui_options">Opcións de interfaz</string>
+
+</resources>
@@ -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>
+
+</resources>
@@ -219,4 +219,6 @@
<string name="private_message">בפרטי</string>
<string name="private_message_to">בפרטי אל %s</string>
<string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
-</resources>
+ <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
+
+</resources>
@@ -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>
+
+</resources>
@@ -153,7 +153,7 @@
<string name="confirm_password">Bevestig wachtwoord</string>
<string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
<string name="invalid_jid">Dit is geen geldig Jabber ID</string>
- <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
+ <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
<string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string>
<string name="contact_status_online">online</string>
<string name="contact_status_free_to_chat">beschikbaar</string>
@@ -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>
-</resources>
+ <string name="pref_ui_options">UI Opties</string>
+
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+</resources>
@@ -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>
+
+</resources>
@@ -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>
+
+ <attr name="TextSizeInfo" format="dimension" />
+ <attr name="TextSizeBody" format="dimension" />
+ <attr name="TextSizeHeadline" format="dimension" />
+
+</resources>
@@ -9,7 +9,7 @@
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item>
</style>
-
+
<style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
<item name="TextSizeInfo">14sp</item>
<item name="TextSizeBody">16sp</item>
@@ -27,9 +27,9 @@
<item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
<item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
</style>
-
+
<style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
- <item name="android:background">@drawable/actionbar_tab_indicator</item>
+ <item name="android:background">@drawable/actionbar_tab_indicator</item>
</style>
</resources>