# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1275257136 -7200
# Node ID 6b48526b94ef6266b9569362f8612356096c053d
# Parent  210b0f7416efd4b6f432bae31289da9f2c7d0ce7# Parent  8d56b9de5a927a7e8d28a226cc43641b66043cd7
merge

diff -r 8d56b9de5a92 -r 6b48526b94ef res/values/arrays.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>