BEEM-OTR: comparison res/values/strings.xml

equal deleted inserted replaced

-:da650185bf8b
+:fd6c52c23165
 	<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="ChangeStatusType">My status</string>
 	<string name="ChangeStatusMessage">My personal message</string>
 	<string name="ChangeStatusActTitle">Beem - Change my 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">Edit your username</string>
 	<string name="SettingsPassword">Edit your password</string>
 	<string name="SettingsCheckboxText">Using Gmail</string>
 	<string name="SettingsGmail">Use my Gmail account</string>
 	<string name="SettingsProxySummary">Login through a proxy server</string>
 	<string name="SettingsProxyType">Protocol</string>
 	<string name="SettingsProxyTypeSummary">Choose the proxy server type</string>
 	<string name="SettingsProxyServer">Edit proxy server address</string>
 	<string name="SettingsProxyPort">Edit proxy server port</string>
-	<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the proxy server</string>
+	<string name="SettingsProxyUser">Optional, allow to authenticate yourself on the
-	<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the proxy server</string>
+		proxy server</string>
+	<string name="SettingsProxyPassword">Optional, allow to authenticate yourself on the
+		proxy server</string>
 	<string name="SettingsAdvanced">Advanced</string>
 	<string name="SettingsAdvancedOptions">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="SettingsAdvancedSpecOpt">Check this box if you want to use a specific server
+		for your connection</string>
 	<string name="SettingsAdvancedAddOpt">Edit the server address</string>
 	<string name="SettingsAdvancedPortOpt">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">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
+	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you
+		want to authorize him/her ?</string>
 	<string name="SubscriptTitle">Authorize buddy ?</string>
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Not connected</string>
 	<!--  BeemChatManager -->
 	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
 	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
+	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.
+	</string>
 	<string name="AcceptContactRequestFrom">Authorize %s to contact you.</string>
-<!-- Activities -->
+	<!-- Activities -->
-<string name="login_tag">Beem - Login Activity</string>
+	<string name="login_tag">Beem - Login Activity</string>
-<string name="edit_settings_name">Beem - Settings</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_name">Beem - Create an account</string>
-<string name="create_account_tag">Beem - CreateAccount Activity</string>
+	<string name="create_account_tag">Beem - CreateAccount Activity</string>
-<string name="contact_list_name">Beem - Contacts</string>
+	<string name="contact_list_name">Beem - Contacts</string>
-<string name="contact_list_tag">Beem - ContactList Activity</string>
+	<string name="contact_list_tag">Beem - ContactList Activity</string>
-<string name="user_info_name">Beem - User Info</string>
+	<string name="user_info_name">Beem - User Info</string>
-<!-- Buttons -->
+	<!-- Buttons -->
-<string name="button_reset">Reset</string>
+	<string name="button_reset">Reset</string>
-<string name="button_login">Login</string>
+	<string name="button_login">Login</string>
-<string name="button_save">Save</string>
+	<string name="button_save">Save</string>
-<string name="button_create_account">Create this account</string>
+	<string name="button_create_account">Create this account</string>
-<string name="button_create_login_account">Create and use this account</string>
+	<string name="button_create_login_account">Create and use this account</string>
-<!-- LogAs Activity -->
+	<!-- 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 !
+		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_max_retry">Max retry</string>
-	<string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</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_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>
 	<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
 	<!-- EditSettings Activity Categories -->
 	<string name="general_preferences">General preferences</string>
 	<string name="user_preferences">User settings</string>
 	<string name="network_preferences">Network options</string>
 	<string name="proxy_proxy_settings">Proxy settings</string>
 	<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
 	<string name="settings_tab_label_proxy">Proxy</string>
 	<!-- EditSettings Activity General Preferences Tabs -->
 	<string name="contact_list_preferences">Buddy list</string>
-	<string name="contact_list_preferences_sum">A set of display options for your buddy list</string>
+	<string name="contact_list_preferences_sum">A set of display options for your buddy list
+	</string>
 	<string name="CLP_hidden_contact">Hidden</string>
-	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies</string>
+	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+	</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_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_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_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>
 	<string name="chat_name">Beem - Chat</string>
 	<string name="chat_input_default_value">Type your message</string>
 	<string name="chat_self">Me</string>
+	<string name="chat_send_message">Send</string>
+	<string name="chat_menu_contacts_list">Contacts list</string>
+	<string name="chat_menu_change_chat">Switch chat</string>
+	<string name="chat_dialog_change_chat_title">Opened chats</string>
+	<string name="chat_menu_close_chat">Close this chat</string>
+	<string name="chat_no_more_chats">No more active chats</string>
 	<string name="contact_status_msg_available">Available</string>
 	<string name="contact_status_msg_available_chat">Available to chat</string>
 	<string name="contact_status_msg_dnd">Do not disturb</string>
 	<string name="contact_status_msg_away">Away</string>
 	<string name="contact_status_msg_xa">Unavailable</string>
 	<string name="contact_status_msg_offline">Disconnected</string>
-<string name="UpdateButton">Update</string>
+	<string name="UpdateButton">Update</string>
-<string name="chat_menu_contacts_list">Contacts list</string>
-<string name="chat_menu_change_chat">Switch chat</string>
-<string name="chat_dialog_change_chat_title">Opened chats</string>
-<string name="chat_menu_close_chat">Close this chat</string>
-<string name="chat_no_more_chats">No more active chats</string>
 </resources>

changeset 517	fd6c52c23165
parent 509	18217d0805d7
child 518	6b8089c9b834