diff --git a/res/layout/channeladd.xml b/res/layout/channeladd.xml
index fac5bd9..118461d 100644
--- a/res/layout/channeladd.xml
+++ b/res/layout/channeladd.xml
@@ -27,7 +27,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
     <TextView
     	android:layout_width="fill_parent"
     	android:layout_height="wrap_content"
-    	android:text="These channels will be automatically joined after connect."
+    	android:text="@string/channel_add_description"
     	android:padding="5px" />
     <ListView
     	android:id="@+id/channels"
diff --git a/res/layout/commandadd.xml b/res/layout/commandadd.xml
index a40e276..8643c73 100644
--- a/res/layout/commandadd.xml
+++ b/res/layout/commandadd.xml
@@ -27,7 +27,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
     <TextView
     	android:layout_width="fill_parent"
     	android:layout_height="wrap_content"
-    	android:text="These commands will be executed after connect."
+    	android:text="@string/command_add_description"
     	android:padding="5px" />
     <ListView
     	android:id="@+id/commands"
@@ -48,7 +48,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
    			android:id="@+id/add"
     		android:layout_width="wrap_content"
     		android:layout_height="wrap_content"
-    		android:text="Add" />
+    		android:text="@string/action_add" />
    	</LinearLayout>
    	<LinearLayout
    		android:orientation="horizontal"
@@ -58,11 +58,11 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	   		android:layout_width="wrap_content"
 	   		android:layout_height="wrap_content"
 	   		android:id="@+id/ok"
-			android:text="Ok" />
+			android:text="@string/action_ok" />
 	   	<Button
 	   		android:layout_width="wrap_content"
 	   		android:layout_height="wrap_content"
-	   		android:id="@+id/cancel"
-			android:text="Cancel" />
+	   		android:id="@+id/action_cancel"
+			android:text="@string/action_cancel" />
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/join.xml b/res/layout/join.xml
index 07f9101..b292182 100644
--- a/res/layout/join.xml
+++ b/res/layout/join.xml
@@ -36,5 +36,5 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 		android:id="@+id/join"
 		android:layout_width="fill_parent"
     	android:layout_height="wrap_content"
-		android:text="Join" />
+		android:text="@string/join" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/rounded.xml b/res/layout/rounded.xml
index 9a4764c..ba0b9c7 100644
--- a/res/layout/rounded.xml
+++ b/res/layout/rounded.xml
@@ -37,5 +37,4 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
    		android:bottomLeftRadius="10dp"
    		android:topLeftRadius="10dp"
    		android:topRightRadius="10dp" />
-		
 </shape>
\ No newline at end of file
diff --git a/res/layout/serveradd.xml b/res/layout/serveradd.xml
index a3cedf3..8d417b6 100644
--- a/res/layout/serveradd.xml
+++ b/res/layout/serveradd.xml
@@ -29,7 +29,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	    android:layout_width="fill_parent"
 	    android:layout_height="fill_parent">
 	    <TextView
-	        android:text="Server"
+	        android:text="@string/server"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
 	        android:background="#ff333333"
@@ -91,7 +91,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 			android:text="@string/server_useSSL" />
 <!-- ############################################################################ -->
         <TextView
-            android:text="User"
+            android:text="@string/user"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="#ff333333"
@@ -100,7 +100,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:padding="3px"
             android:layout_margin="2px" />
         <TextView
-            android:text="Nickname"
+            android:text="@string/nickname"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
         <EditText
@@ -109,7 +109,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_height="wrap_content"
             android:singleLine="true" />
         <TextView
-            android:text="Ident"
+            android:text="@string/ident"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
         <EditText
@@ -119,7 +119,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:text="yaaic"
             android:singleLine="true" />
         <TextView
-            android:text="Real Name"
+            android:text="@string/realname"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
         <EditText
@@ -130,7 +130,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:singleLine="true" />
 <!-- ############################################################################ -->
 		<TextView
-		     android:text="On Connect"
+		     android:text="@string/on_connect"
 		     android:layout_width="fill_parent"
 		     android:layout_height="wrap_content"
 		     android:background="#ff333333"
@@ -142,15 +142,15 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 			android:id="@+id/channels"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:text="Channels" />
+			android:text="@string/channels" />
 		<Button
 			android:id="@+id/commands"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:text="Commands" />
+			android:text="@string/commands" />
 <!-- ############################################################################ -->
 		<TextView
-		     android:text="Preferences"
+		     android:text="@string/preferences"
 		     android:layout_width="fill_parent"
 		     android:layout_height="wrap_content"
 		     android:background="#ff333333"
@@ -159,7 +159,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 		     android:padding="3px"
 		     android:layout_margin="2px" />
         <TextView
-            android:text="Charset"
+            android:text="@string/charset"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
         <Spinner
@@ -181,7 +181,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 				android:layout_weight="1" />
             <Button
                 android:id="@+id/cancel"
-                android:text="@string/cancel"
+                android:text="@string/action_cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0" />
diff --git a/res/layout/user.xml b/res/layout/user.xml
index 27a1dfa..c44b2e1 100644
--- a/res/layout/user.xml
+++ b/res/layout/user.xml
@@ -41,13 +41,13 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 			android:layout_weight="1"
-	    	android:text="Op" />
+	    	android:text="@string/button_op" />
 	    <Button
 	    	android:id="@+id/deop"
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 	    	android:layout_weight="1"
-	    	android:text="DeOp" />
+	    	android:text="@string/button_deop" />
 	</LinearLayout>
 	<LinearLayout
 	    android:orientation="horizontal"
@@ -58,13 +58,13 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 			android:layout_weight="1"
-	    	android:text="Voice" />
+	    	android:text="@string/button_voice" />
 	    <Button
 	    	android:id="@+id/devoice"
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 	    	android:layout_weight="1"
-	    	android:text="DeVoice" />
+	    	android:text="@string/button_devoice" />
 	</LinearLayout>
 	<LinearLayout
 	    android:orientation="horizontal"
@@ -75,12 +75,12 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 	    	android:layout_weight="1"
-	    	android:text="Kick" />
+	    	android:text="@string/button_kick" />
 	    <Button
 	    	android:id="@+id/ban"
 	    	android:layout_width="fill_parent"
 	    	android:layout_height="wrap_content"
 			android:layout_weight="1"
-	    	android:text="Ban" />
+	    	android:text="@string/button_ban" />
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/application.xml b/res/values/application.xml
index 615ce23..1b24264 100644
--- a/res/values/application.xml
+++ b/res/values/application.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name">Yaaic</string>
     <string name="app_full_name">Yet Another Android IRC Client</string>
-    <string name="app_version">0.4.1</string>
+    <string name="app_version">0.5</string>
     <string name="app_homepage">http://www.yaaic.org</string>
     <string name="app_copyright">(C) 2009-2010 Sebastian Kaspari</string>
     
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60c23f1..6b7a7d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,46 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="add_server_menu">Add server</string>
-    <string name="settings_menu">Settings</string>
-    <string name="about_menu">About</string>
-    <string name="exit_menu">Exit</string>
-    
-    <string name="add_server_label">Add new server</string>
-    <string name="server_title">Title</string>
-    <string name="server_host">Host</string>
-    <string name="server_port">Port</string>
-    <string name="server_password">Password</string>
-    <string name="server_useSSL">Use SSL</string>
-    <string name="server_autoconnect">Auto connect on startup</string>
-    <string name="server_channels">Channels</string>
-    <string name="add_server">Add server</string>
-    <string name="select_charset">Select a charset</string>
-    
-    <string name="cancel">Cancel</string>
-    
-    <string name="channel">Channel</string>
-    <string name="join">Join</string>
-    <string name="join_channel">Join Channel</string>
-    <string name="close">Close</string>
-    <string name="users">Users</string>
-    <string name="connect">Connect</string>
-    <string name="disconnect">Disconnect</string>
-    <string name="edit">Edit</string>
-    <string name="delete">Delete</string>
-    
-    <string name="about_label">About</string>
+	<string name="add_server_menu">Add server</string>
+	<string name="settings_menu">Settings</string>
+	<string name="about_menu">About</string>
+	<string name="exit_menu">Exit</string>
 
+	<string name="about_label">About</string>
 	<string name="settings_label">Settings</string>
-	
 	<string name="join_label">Join channel</string>
-	
 	<string name="users_label">Users</string>
-	
 	<string name="channels_label">Channels</string>
-	
+	<string name="add_server_label">Add new server</string>
+
+	<string name="server_title">Title</string>
+	<string name="server_host">Host</string>
+	<string name="server_port">Port</string>
+	<string name="server_password">Password</string>
+	<string name="server_useSSL">Use SSL</string>
+	<string name="server_autoconnect">Auto connect on startup</string>
+	<string name="server_channels">Channels</string>
+	<string name="add_server">Add server</string>
+	<string name="select_charset">Select a charset</string>
+	<string name="nickname">Nickname</string>
+	<string name="ident">Ident</string>
+	<string name="realname">Real Name</string>
+
+	<string name="server">Server</string>
+	<string name="channel">Channel</string>
+	<string name="channels">Channels</string>
+	<string name="commands">Commands</string>
+	<string name="user">User</string>
+	<string name="join">Join</string>
+	<string name="join_channel">Join Channel</string>
+	<string name="close">Close</string>
+	<string name="users">Users</string>
+	<string name="connect">Connect</string>
+	<string name="disconnect">Disconnect</string>
+	<string name="edit">Edit</string>
+	<string name="delete">Delete</string>
+	<string name="on_connect">On connect</string>
+	<string name="preferences">Preferences</string>
+	<string name="charset">Charset</string>
+
 	<string name="action_remove">Remove</string>
+	<string name="action_add">Add</string>
+	<string name="action_ok">Ok</string>
+	<string name="action_cancel">Cancel</string>
 	<string name="negative_button">No</string>
-	
+
+	<string name="channel_add_description">These channels will be automatically joined after connect.</string>
+	<string name="command_add_description">These commands will be executed after connect.</string>
+
 	<string name="validation_blank_title">Title cannot be blank</string>
 	<string name="validation_blank_host">Host cannot be blank</string>
 	<string name="validation_invalid_port">Enter a numeric port</string>
@@ -51,7 +61,7 @@
 	<string name="validation_blank_realname">Realname cannot be blank</string>
 	<string name="validation_invalid_nickname">Invalid nickname</string>
 	<string name="validation_invalid_ident">Invalid ident</string>
-	
+
 	<string name="only_usable_from_channel">Only usable from within a channel</string>
 	<string name="only_usable_from_channel_or_query">Only usable from within a channel or a query</string>
 	<string name="chat_only_form_channel">You can only chat from within a channel or a query</string>
@@ -68,37 +78,37 @@
 	<string name="available_commands">Available commands:</string>
 	<string name="logical_or">or</string>
 	<string name="query_to_channel">You cannot open queries to channels</string>
-	<string name="query_exists"></string>
+	<string name="query_exists" />
 	<string name="line_missing">Line is missing</string>
-	
+
 	<string name="command_desc_amsg">Send a message to all channels</string>
 	<string name="command_desc_away">Sets you away</string>
 	<string name="command_desc_close">Closes the current window</string>
 	<string name="command_desc_dcc">Send a file to a user</string>
 	<string name="command_desc_deop">Remove operator status from a user</string>
-    <string name="command_desc_devoice">Remove voice status from a user</string>
-    <string name="command_desc_echo">Print text to window</string>
-    <string name="command_desc_help">Lists all available commands</string>
-    <string name="command_desc_join">Join a channel</string>
-    <string name="command_desc_kick">Kicks a user</string>
-    <string name="command_desc_me">Perform an action</string>
-    <string name="command_desc_mode">Change channel modes</string>
-    <string name="command_desc_msg">Send a message to a channel or user</string>
-    <string name="command_desc_names">Lists all users in channel</string>
-    <string name="command_desc_nick">Change own nickname</string>
-    <string name="command_desc_notice">Send a notice to an other user</string>
-    <string name="command_desc_op">Give a user operator status</string>
-    <string name="command_desc_part">Leave the current channel</string>
-    <string name="command_desc_query">Open a private chat with a user</string>
-    <string name="command_desc_quit">Disconnect from server</string>
-    <string name="command_desc_raw">Send a raw line to the server</string>
-    <string name="command_desc_topic">Show or change the current topic</string>
-    <string name="command_desc_voice">Give a user voice status</string>
-    <string name="command_desc_whois">Get information about a user</string>
+	<string name="command_desc_devoice">Remove voice status from a user</string>
+	<string name="command_desc_echo">Print text to window</string>
+	<string name="command_desc_help">Lists all available commands</string>
+	<string name="command_desc_join">Join a channel</string>
+	<string name="command_desc_kick">Kicks a user</string>
+	<string name="command_desc_me">Perform an action</string>
+	<string name="command_desc_mode">Change channel modes</string>
+	<string name="command_desc_msg">Send a message to a channel or user</string>
+	<string name="command_desc_names">Lists all users in channel</string>
+	<string name="command_desc_nick">Change own nickname</string>
+	<string name="command_desc_notice">Send a notice to an other user</string>
+	<string name="command_desc_op">Give a user operator status</string>
+	<string name="command_desc_part">Leave the current channel</string>
+	<string name="command_desc_query">Open a private chat with a user</string>
+	<string name="command_desc_quit">Disconnect from server</string>
+	<string name="command_desc_raw">Send a raw line to the server</string>
+	<string name="command_desc_topic">Show or change the current topic</string>
+	<string name="command_desc_voice">Give a user voice status</string>
+	<string name="command_desc_whois">Get information about a user</string>
 
 	<string name="notification_connected">Connected to %1$s</string>
 	<string name="notification_disconnected">Disconnected from %1$s</string>
-	
+
 	<string name="message_connected">Connected to %1$s</string>
 	<string name="message_deop">%1$s deops %2$s</string>
 	<string name="message_devoice">%1$s devoices %2$s</string>
@@ -131,4 +141,11 @@
 	<string name="message_set_moderated">%1$s sets moderated</string>
 	<string name="message_remove_moderated">%1$s removes moderated</string>
 	<string name="message_disconnected">Disconnected</string>
+	
+	<string name="button_op">Op</string>
+	<string name="button_deop">DeOp</string>
+	<string name="button_voice">Voice</string>
+	<string name="button_devoice">DeVoice</string>
+	<string name="button_kick">Kick</string>
+	<string name="button_ban">Ban</string>
 </resources>
\ No newline at end of file