# HG changeset patch
# User dasilvj
# Date 1256918835 -3600
# Node ID 3be6014b6cf4d402e82ec192ecb45d4a52b18dca
# Parent eb6f1fbea903ed89723812616aff26534516be23
Suppression du dossier values-en.
diff -r eb6f1fbea903 -r 3be6014b6cf4 res/values-en/strings.xml
--- a/res/values-en/strings.xml Fri Oct 30 17:04:52 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-
-
- Beem
- Ok
- Clear
- Cancel
- Accept
- Refuse
-
-
- Jabber ID
-
-
- Connecting...
-
-
- Use Beem Service
- Beem Service Created
- Beem Service Destroyed
-
-
- Status
- status_text
- preference_is_configured
-
-
-
- Server connection
- User id:
- Password:
- Service:
- Port:
- Proxy informations
- Login:
- Ok
-
-
- Chat
- Call
- Manage User
-
-
- Beem - Add contact
-
- Login :
- Alias :
- Group :
- Ok
- Contact added
- Error Contact not added
- Error Login
- Bad form
- Contact already exist
-
-
- Beem - Chat
-
- %s says :\n%s\n
- You say :\n%s\n
- %s\n
- Tip text here
- Is :
- Error : %s\n
- and is speaking from :
- Insert a smiley
- login
- No status set
-
-
- Type here your status message :
-
- Beem - Change status
- Add new contact
- Beem Project
- Create account
- Edit account
- Updating status
- Nothing to change
-
-
- Modify my username
- Modify my password
- Using Gmail
- Use my Gmail account
- Proxy
- Use a proxy server
- Check this box if you\'re behind a proxy server
- Protocol
- Choose the proxy server type
- Address definition of the proxy server
- Port definition of the proxy server
- Optional, allow to authenticate yourself on the proxy server
- Optional, allow to authenticate yourself on the proxy server
- Advanced
- Use specific server option
- Modify reconnection delay
- Check this box if you want to use a specific server for your connection
- Allow to edit the server address
- Allow to edit the server port
-
-
- Subscription accepted
- Subscription error
- Subscription refused
- You have received a request for add by %s. Do you want to accept it ?
-
-
- Not connected
-
-
- You\'ve got a new message
-
-
- You have been disconnected
-
-
- Accept contact request
- Accept contact request from
-
-
-
-
- Beem - Login Activity
- Beem - Settings
- Beem - EditSettings Activity
- Beem - Create an account
- Beem - CreateAccount Activity
- Beem - Contacts
- Beem - ContactList Activity
- Beem - User Info
-
-
-
- Reset
- Login
- Save
- Create this account
- Create and log
-
-
-
- Username
- Password
- Login - Error
- Close
- Create an account
- Settings
- About
- About
-
- Beem is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
-
- Close
- Settings
- Log in
- Connecting. Please wait...
- Unfortunately, an error occured.\n\nError detail:\n%s
-
-
- Create an account
- Login
- The settings have been saved successfully.
- beem_settings
- Reconnection delay
- beem_account_username
- beem_account_password
- beem_xmpp_server
- beem_xmpp_port
- beem_xmpp_tls_use
- beem_xmpp_proxy_use
- beem_xmpp_proxy_server
- beem_xmpp_proxy_port
- beem_xmpp_proxy_username
- beem_xmpp_proxy_password
- beem_xmpp_proxy_type
-
-
- edit_settings_tab_account
- Account
- edit_settings_tab_xmpp
- XMPP
- edit_settings_tab_proxy
- Proxy
-
-
- Username
- Password
- Server
- Port
-
-
- Server
- Port
- Require SSL/TLS
-
-
- Connect using a proxy
- Choose a type of proxy
- Server
- Port
- Username
- Password
-
-
- Create an account - Instructions
- Create an account - Error
- Change my settings
- Close
- has been created successfully
- Bad JabberID
- Passwords do not match.
- Username
- Password
- Confirm password
-
-
- Add a contact
- Settings
- All contacts
- No group
-
-
- Alias
- Manage groups
- Resend invit
- Block
- Delete
- Suscription resend
- Are you sure you want to delete this contact?
- Yes
- No
- Are you sure you want to resend invit?
-
-Beem - Chat
-Type your message
-
diff -r eb6f1fbea903 -r 3be6014b6cf4 res/values/strings.xml
--- a/res/values/strings.xml Fri Oct 30 17:04:52 2009 +0100
+++ b/res/values/strings.xml Fri Oct 30 17:07:15 2009 +0100
@@ -82,7 +82,7 @@
Modify my password
Using Gmail
Use my Gmail account
- Beem - Settings - Proxy server
+ Proxy
Use a proxy server
Check this box if you\'re behind a proxy server
Protocol
@@ -91,7 +91,7 @@
Port definition of the proxy server
Optional, allow to authenticate yourself on the proxy server
Optional, allow to authenticate yourself on the proxy server
- Beem - Settings - Advanced options
+ Advanced
Use specific server option
Modify reconnection delay
Check this box if you want to use a specific server for your connection
@@ -247,4 +247,6 @@
No
Are you sure you want to resend invit?
+Beem - Chat
+Type your message