# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1263661112 -3600
# Node ID af35b5109f172411de5798991e89919b7ed5cf85
# Parent  f1d6e2fa672f551cd161d1d5e752057485d57c85# Parent  048bc25afa8374ac5c8841eb2495a5dc40631f6f
merge

diff -r 048bc25afa83 -r af35b5109f17 AndroidManifest.xml
--- a/AndroidManifest.xml	Fri Jan 15 20:05:28 2010 +0100
+++ b/AndroidManifest.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
-	android:versionName="0.1">
+	android:versionName="0.1.1">
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
 		android:debuggable="true" android:name="@string/app_name">
diff -r 048bc25afa83 -r af35b5109f17 res/layout/chat.xml
--- a/res/layout/chat.xml	Fri Jan 15 20:05:28 2010 +0100
+++ b/res/layout/chat.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -2,25 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
-	<RelativeLayout android:id="@+id/chat_header"
+	<LinearLayout android:id="@+id/chat_header"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:orientation="horizontal" android:gravity="center_vertical"
 		android:background="#222222" android:padding="4px">
 		<ImageView android:id="@+id/chat_contact_status_icon"
 			android:adjustViewBounds="true" android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true" />
-		<TextView android:id="@+id/chat_contact_name"
+			android:layout_height="wrap_content" android:gravity="center_vertical" />
+		<LinearLayout android:orientation="vertical"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/chat_contact_status_icon"
-			android:layout_marginLeft="15sp"
-			android:lines="1" android:singleLine="true" android:textSize="16sp"
-			android:textStyle="bold" android:textColor="#FFFFFF" />
-		<TextView android:id="@+id/chat_contact_status_msg"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_below="@id/chat_contact_name" android:layout_alignLeft="@id/chat_contact_name"
-			android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
-			android:textColorLink="#FFFFFF" />
-	</RelativeLayout>
+			android:paddingLeft="15sp">
+			<TextView android:id="@+id/chat_contact_name"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:lines="1" android:singleLine="true" android:textSize="16sp"
+				android:textStyle="bold" android:textColor="#FFFFFF" />
+			<TextView android:id="@+id/chat_contact_status_msg"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
+				android:textColorLink="#FFFFFF" />
+		</LinearLayout>
+	</LinearLayout>
 	<View android:layout_width="fill_parent" android:layout_height="2dp"
 		android:fadingEdge="horizontal" android:background="#555555" />
 	<ListView android:id="@+id/chat_messages"
@@ -31,7 +32,7 @@
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
 		android:background="#222222" android:padding="8px">
-		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
+		<EditText android:id="@+id/chat_input" android:layout_width="wrap_content"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
 			android:inputType="textShortMessage|textAutoCorrect|textMultiLine"
diff -r 048bc25afa83 -r af35b5109f17 res/menu/edit_settings.xml
--- a/res/menu/edit_settings.xml	Fri Jan 15 20:05:28 2010 +0100
+++ b/res/menu/edit_settings.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -4,7 +4,7 @@
 		android:icon="@drawable/ic_menu_invite"
 		android:title="@string/settings_menu_create_account" />
 	<item android:id="@+id/settings_menu_privacy_lists"
-		android:visible="true"
+		android:visible="false"
 		android:title="@string/settings_menu_privacy_lists"
 		android:icon="@drawable/ic_menu_blocked_user" />
 </menu>
diff -r 048bc25afa83 -r af35b5109f17 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Fri Jan 15 20:05:28 2010 +0100
+++ b/res/values-fr/strings.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -220,7 +220,7 @@
 	<string name="comments_xmpp_server">example.com</string>
 	<string name="settings_xmpp_port">Port</string>
 	<string name="comments_xmpp_port">Default: 5222</string>
-	<string name="settings_xmpp_use_tls">Utiliser SSL/TLS</string>
+	<string name="settings_xmpp_use_tls">SSL/TLS obligatoire</string>
 	<string name="settings_reco_delay">Délai de reconnexion</string>