merge
authorDa Risk <darisk972@gmail.com>
Mon, 31 May 2010 00:05:36 +0200
changeset 746 6b48526b94ef
parent 738 210b0f7416ef (diff)
parent 745 8d56b9de5a92 (current diff)
child 747 22969380eb13
merge
res/drawable/beem_icon_launcher_color106.png
res/drawable/beem_icon_launcher_color160.png
res/drawable/beem_icon_launcher_color80.png
res/layout-large-land/login_anim.xml
res/layout-large/login_anim.xml
res/layout-small/login_anim.xml
--- a/res/values/arrays.xml	Fri May 21 00:02:10 2010 +0200
+++ b/res/values/arrays.xml	Mon May 31 00:05:36 2010 +0200
@@ -6,8 +6,8 @@
 		<item>SOCKS5</item>
 	</string-array>
 	<string-array name="status_types">
-		<item name="AvailableForChat">@string/contact_status_msg_available</item>
-		<item name="Available">@string/contact_status_msg_available_chat</item>
+		<item name="AvailableForChat">@string/contact_status_msg_available_chat</item>
+		<item name="Available">@string/contact_status_msg_available</item>
 		<item name="Busy">@string/contact_status_msg_dnd</item>
 		<item name="Away">@string/contact_status_msg_away</item>
 		<item name="Unavailable">@string/contact_status_msg_xa</item>