# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1256916299 -3600
# Node ID 7782f6193322b57ea39ad18c8af924f41c856944
# Parent  2d75e771419d4b0efb42c74cee84ca0752f56001# Parent  4e4c5257e3deba336f5c80f5d7804bcd95543436
merge

diff -r 4e4c5257e3de -r 7782f6193322 libs/jstun-0.7.3.jar
Binary file libs/jstun-0.7.3.jar has changed
diff -r 4e4c5257e3de -r 7782f6193322 res/values-en/arrays.xml
--- a/res/values-en/arrays.xml	Thu Oct 29 16:26:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string-array name="proxy_types">
-		<item>HTTP</item>
-		<item>SOCKS4</item>
-		<item>SOCKS5</item>
-	</string-array>
-	<string-array name="status_types">
-		<item name="AvailableForChat">Available for chat</item>
-		<item name="Available">Available</item>
-		<item name="Busy">Busy</item>
-		<item name="Away">Away</item>
-		<item name="Unavailable">Unavailable</item>
-		<item name="Disconnected">Disconnected</item>
-	</string-array>
-</resources>
diff -r 4e4c5257e3de -r 7782f6193322 res/values-en/strings.xml
--- a/res/values-en/strings.xml	Thu Oct 29 16:26:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="app_name">Beem</string>
-	<string name="OkButton">Ok</string>
-	<string name="ClearButton">Clear</string>
-	<string name="CancelButton">Cancel</string>
-	<string name="AcceptButton">Accept</string>
-	<string name="RefuseButton">Refuse</string>
-
-	<!--  Beem class -->
-	<string name="BeemJabberID">Jabber ID</string>
-
-	<!--  BeemApplication class -->
-	<string name="BeemApplicationConnect">Connecting...</string>
-
-	<!--  BeemService class -->
-	<string name="BeemServiceDescription">Use Beem Service</string>
-	<string name="BeemServiceCreated">Beem Service Created</string>
-	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
-
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
-	<!-- ContactListSettings class -->
-	<string name="CLSServerConnection">Server connection</string>
-	<string name="CLSUserid">User id:</string>
-	<string name="CLSPassword">Password:</string>
-	<string name="CLSService">Service:</string>
-	<string name="CLSHostPort">Port:</string>
-	<string name="CLSProxyInfo">Proxy informations</string>
-	<string name="CLSLogin">Login:</string>
-	<string name="CLSOkButton">Ok</string>
-
-	<!--  ContactDialog class -->
-	<string name="CDChat">Chat</string>
-	<string name="CDCall">Call</string>
-	<string name="CDInfos">Manage User</string>
-
-	<!-- AddContact class -->
-	<string name="AddCActTitle">Beem - Add contact</string>
-
-	<string name="AddCLogin">Login :</string>
-	<string name="AddCAlias">Alias :</string>
-	<string name="AddCGroup">Group :</string>
-	<string name="AddCOkButton">Ok</string>
-	<string name="AddCContactAdded">Contact added</string>
-	<string name="AddCContactAddedError">Error Contact not added</string>
-	<string name="AddCContactAddedLoginError">Error Login</string>
-	<string name="AddCBadForm">Bad form</string>
-	<string name="AddCContactAlready">Contact already exist</string>
-
-	<!--  SendIM class -->
-	<string name="SendIMActTitle">Beem - Chat</string>
-
-	<string name="SendIMSays"> %s says :\n%s\n</string>
-	<string name="SendIMYouSay">You say :\n%s\n</string>
-	<string name="SendIMSameSpeaker">%s\n</string>
-	<string name="SendIMToSendHint">Tip text here</string>
-	<string name="SendIMState">Is : </string>
-	<string name="SendIMErrorMsg">Error : %s\n</string>
-	<string name="SendIMFrom">and is speaking from : </string>
-	<string name="SendIMSmiley">Insert a smiley</string>
-	<string name="SendIMLoginHint">login</string>
-	<string name="SendIMNoStatusSet">No status set</string>
-	
-	<!--  ChangeStatus class -->
-	<string name="ChangeStatusText">Type here your status message :</string>
-
-	<string name="ChangeStatusActTitle">Beem - Change status</string>
-	<string name="MenuAddContact">Add new contact</string>
-	<string name="MenuAccountAbout">Beem Project</string>
-	<string name="MenuAccountCreate">Create account</string>
-	<string name="MenuConnection">Edit account</string>
-	<string name="ChangeStatusOk">Updating status</string>
-	<string name="ChangeStatusNoChange">Nothing to change</string>
-	
-	<!-- Settings class -->
-	<string name="SettingsText">Modify my username</string>
-	<string name="SettingsPassword">Modify my password</string>
-	<string name="SettingsCheckboxText">Using Gmail</string>
-	<string name="SettingsGmail">Use my Gmail account</string>
-	<string name="SettingsProxy">Beem - Settings - Proxy server</string>
-	<string name="SettingsProxyProxy">Use a proxy server</string>
-	<string name="SettingsProxySummary">Check this box if you\'re behind a proxy server</string>
-	<string name="SettingsProxyType">Protocol</string>
-	<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
-	<string name="SettingsProxyServer">Address definition of the proxy server</string>
-	<string name="SettingsProxyPort">Port definition of the proxy server</string>
-	<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the proxy server</string>
-	<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the proxy server</string>
-	<string name="SettingsAdvanced">Beem - Settings - Advanced options</string>
-	<string name="SettingsAdvancedOptions">Use specific server option</string>
-	<string name="SettingsAdvancedRecoDelay">Modify reconnection delay</string>
-	<string name="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server for your connection</string>
-	<string name="SettingsAdvancedAddOpt">Allow to edit the server address</string>
-	<string name="SettingsAdvancedPortOpt">Allow to edit the server port</string>
-	
-	<!-- Subscription class -->
-	<string name="SubscriptAccept">Subscription accepted</string>
-	<string name="SubscriptError">Subscription error</string>
-	<string name="SubscriptRefused">Subscription refused</string>
-	<string name="SubscriptText">You have received a request for add by %s. Do you want to accept it ?</string>
-	
-	<!-- ContactList class -->
-	<string name="ConListNotConnected">Not connected</string>
-
-	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">You\'ve got a new message</string>
-	
-	<!--  BeemBroadcastReceiver class -->
-	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
-	
-	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">Accept contact request</string>
-	<string name="AcceptContactRequestFrom">Accept contact request from </string>
-	
-    <!--
-    	Services
-    -->
-    
-    <!--
-    	Activities
-    -->
-    <string name="login_tag">Beem - Login Activity</string>
-    <string name="edit_settings_name">Beem - Settings</string>
-	<string name="edit_settings_tag">Beem - EditSettings Activity</string>	
-    <string name="create_account_name">Beem - Create an account</string>
-    <string name="create_account_tag">Beem - CreateAccount Activity</string>
-    <string name="contact_list_name">Beem - Contacts</string>
-    <string name="contact_list_tag">Beem - ContactList Activity</string>
-    <string name="user_info_name">Beem - User Info</string>
-
-    
-    <!--
-    	Buttons
-    -->
-    <string name="button_reset">Reset</string>
-    <string name="button_login">Login</string>
-    <string name="button_save">Save</string>
-    <string name="button_create_account">Create this account</string>
-    <string name="button_create_login_account">Create and log</string>
-    
-    
-    <!--
-    	LogAs Activity
-    -->
-	<string name="login_username">Username</string>
-	<string name="login_password">Password</string>
-	<string name="login_error_dialog_title">Login - Error</string>
-	<string name="login_close_dialog_button">Close</string>
-	<string name="login_menu_create_account">Create an account</string>
-	<string name="login_menu_settings">Settings</string>
-	<string name="login_menu_about">About</string>
-	<string name="login_about_title">About</string>
-	<string name="login_about_msg">
-		Beem is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
-	</string>
-	<string name="login_about_button">Close</string>
-	<string name="login_settings_button">Settings</string>
-	<string name="login_login_button">Log in</string>
-	<string name="login_login_progress">Connecting. Please wait...</string>
-	<string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</string>
-	
-	<!--
-		EditSettings Activity
-	-->
-	<string name="settings_menu_create_account">Create an account</string>
-	<string name="settings_menu_login">Login</string>
-	<string name="settings_saved_ok">The settings have been saved successfully.</string>
-	<string name="settings_filename">beem_settings</string>
-	<string name="settings_reco_delay">Reconnection delay</string>
-	<string name="settings_key_account_username">beem_account_username</string>
-	<string name="settings_key_account_password">beem_account_password</string>
-	<string name="settings_key_xmpp_server">beem_xmpp_server</string>
-	<string name="settings_key_xmpp_port">beem_xmpp_port</string>
-	<string name="settings_key_xmpp_tls_use">beem_xmpp_tls_use</string>
-	<string name="settings_key_proxy_use">beem_xmpp_proxy_use</string>
-	<string name="settings_key_proxy_server">beem_xmpp_proxy_server</string>
-	<string name="settings_key_proxy_port">beem_xmpp_proxy_port</string>
-	<string name="settings_key_proxy_username">beem_xmpp_proxy_username</string>
-	<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
-	<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
-	
-	<!-- EditSettings Activity tabs -->
-	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
-	<string name="settings_tab_label_account">Account</string>
-	<string name="settings_tab_tag_xmpp">edit_settings_tab_xmpp</string>
-	<string name="settings_tab_label_xmpp">XMPP</string>
-	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
-	<string name="settings_tab_label_proxy">Proxy</string>
-	
-	<!-- EditSettings Activity Account tab -->
-	<string name="settings_account_username">Username</string>
-	<string name="settings_account_password">Password</string>
-	<string name="settings_account_server">Server</string>
-	<string name="settings_account_port">Port</string>
-	
-	<!-- EditSettings Activity XMPP tab -->
-	<string name="settings_xmpp_server">Server</string>
-	<string name="settings_xmpp_port">Port</string>
-	<string name="settings_xmpp_use_tls">Require SSL/TLS</string>
-	
-	<!-- EditSettings Activity Proxy tab -->
-	<string name="settings_proxy_use">Connect using a proxy</string>
-	<string name="settings_proxy_type_prompt">Choose a type of proxy</string>
-	<string name="settings_proxy_server">Server</string>
-	<string name="settings_proxy_port">Port</string>
-	<string name="settings_proxy_username">Username</string>
-	<string name="settings_proxy_password">Password</string>
-	
-	<!--
-		Create an account Activity
-	-->
-	<string name="create_account_instr_dialog_title">Create an account - Instructions</string>
-	<string name="create_account_err_dialog_title">Create an account - Error</string>
-	<string name="create_account_err_dialog_settings_button">Change my settings</string>
-	<string name="create_account_close_dialog_button">Close</string>
-	<string name="create_account_successfull_after">has been created successfully</string>
-	<string name="create_account_err_username">Bad JabberID</string>
-	<string name="create_account_err_passwords">Passwords do not match.</string>
-	<string name="create_account_username">Username</string>
-	<string name="create_account_password">Password</string>
-	<string name="create_account_confirm_password">Confirm password</string>
-	
-	<!--
-		ContactList Activity 
-	-->
-	<string name="contact_list_menu_add_contact">Add a contact</string>
-	<string name="contact_list_menu_settings">Settings</string>
-	<string name="contact_list_all_contact">All contacts</string>
-	<string name="contact_list_no_group">No group</string>
-	 
-	<!-- 
-		UserInfo Activity
-	-->
-	<string name="userinfo_label_alias">Alias</string>
-	<string name="userinfo_label_chg_group">Manage groups</string>
-	<string name="userinfo_label_re_suscription">Resend invit</string>
-	<string name="userinfo_label_block">Block</string>
-	<string name="userinfo_label_delete">Delete</string>
-	<string name="userinfo_resend">Suscription resend</string>
-	<string name="userinfo_sure2delete">Are you sure you want to delete this contact?</string>
-	<string name="userinfo_yes">Yes</string>
-	<string name="userinfo_no">No</string>
-	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
-
-</resources>
diff -r 4e4c5257e3de -r 7782f6193322 res/values/arrays.xml
diff -r 4e4c5257e3de -r 7782f6193322 res/values/strings.xml