# HG changeset patch # User J. Da Silva # Date 1246001959 -7200 # Node ID 9236b57675c9560e2290bebd248c1a764dbca808 # Parent 78ce8be73f4727cc9a0ebaa4e919d06a017a6b6b# Parent 5427deeda4e0ce3dcc264b9e56dca63e4db623f6 Merge diff -r 5427deeda4e0 -r 9236b57675c9 .classpath --- a/.classpath Thu Jun 25 20:12:07 2009 +0200 +++ b/.classpath Fri Jun 26 09:39:19 2009 +0200 @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff -r 5427deeda4e0 -r 9236b57675c9 AndroidManifest.xml --- a/AndroidManifest.xml Thu Jun 25 20:12:07 2009 +0200 +++ b/AndroidManifest.xml Fri Jun 26 09:39:19 2009 +0200 @@ -1,4 +1,4 @@ - + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-en/arrays.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-en/arrays.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,8 @@ + + + + HTTP + SOCKS4 + SOCKS5 + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-en/colors.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-en/colors.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,6 @@ + + + #A0C8FF + #000000 + #FFFFFF + \ No newline at end of file diff -r 5427deeda4e0 -r 9236b57675c9 res/values-en/strings.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-en/strings.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,248 @@ + + + Beem + Ok + Clear + Accept + Refuse + + + + Jabber ID + + + + Connecting... + + + + Use the Beem Service + BeemService Created + BeemService destroyed + + + + Beem + host + Jabber ID + login + password + service + port + proxy_host + proxy_port + use_proxy + proxy_type + proxy_user + proxy_password + None + HTTP + SOCKS4 + SOCKS5 + status + status_text + + + Server connection + Userid: + Password: + Service: + Host/Port: + Proxy informations + Login: + Ok + + + Chat + Alias + Resend suscription + User infos + Block user + Delete user + Are you sure you want to delete this contact? + + Yes + No + + + Login: + Email: + Password: + Repeat: + Ok + Log with + Bad form + Account created + + + Beem - Add contact + Login: + Alias: + Group: + Ok + Contact added + Error Contact not added + Error Login + Bad form + + + + 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 + + + Subscription accepted + Subscription error + Subscription refused + You have received a request for add by %s. Do you want to accept it ? + + + Not connected + + + You have got a new message + + + + + BEEM - Login Activity + + BEEM - Settings + BEEM - EditSettings Activity + + BEEM - Create an account + BEEM - CreateAccount Activity + + BEEM - Contacts + BEEM - ContactList Activity + + + + 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 + + + + Create an account + Login + + The settings have been saved successfully. + + beem_settings + 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 + Passwords do not match. + + Username + Password + Confirm password + + + Add a contact + Settings + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-en/styles.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-en/styles.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-fr/arrays.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-fr/arrays.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,8 @@ + + + + HTTP + SOCKS4 + SOCKS5 + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-fr/colors.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-fr/colors.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,6 @@ + + + #A0C8FF + #000000 + #FFFFFF + \ No newline at end of file diff -r 5427deeda4e0 -r 9236b57675c9 res/values-fr/strings.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-fr/strings.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,247 @@ + + + Beem + Ok + Annuler + Accepter + Refuser + + + + Jabber ID + + + + Connexion en cours... + + + + Utilisation du service BEEM + BeemService Créé + BeemService détruit + + + + Beem + host + Jabber ID + login + password + service + port + proxy_host + proxy_port + use_proxy + proxy_type + proxy_user + proxy_password + None + HTTP + SOCKS4 + SOCKS5 + status + status_text + + + Connexion au serveur + Utilisateurid: + Mot de passe: + Service: + Host/Port: + Informations Proxy + Nom d'utilisateur: + Ok + + + Chat + Alias + Réenvoyer la demande + Informations utilisateur + Bloquer l'utilisateur + Supprimer l'utilisateur + Êtes-vous sûr de vouloir supprimer ce contact ? + Oui + Non + + + Nom d'utilisateur: + Courriel: + Mot de passe: + Répéter: + Ok + Se connecter avec + Mauvais formulaire + Compte créé + + + Beem - Ajouter un contact + Nom d'utilisateur: + Alias: + Groupe: + Ok + Contact ajouté + Erreur Contact pas ajouté + Error Nom d'utilisateur + Mauvais formulaire + + + + Beem - Chat + %s dit :\n%s\n + Vous dites :\n%s\n + %s\n + Tapez votre texte ici + Est : + Erreur : %s\n + et est entrain de parler depuis : + Insérer un sourire + nom d'uilisateur + Aucun statut défini + + + Tapez votre message de statut ici : + Beem - Changer statut + + Ajouter un nouveau contact + Beem Project + Créé un compte + Modifier compte + + Mise à jour du statut + Rien à changer + + + Abonnement accepté + Erreur d'abonnement + Abonnement refusé + Vous avez une requête d'ajout de la part de %s. Souhaitez-vous l'accepter ? + + + Non connecté + + + Vous avez reçu un nouveau message + + + + + BEEM - Activité de connexion + + BEEM - Paramètres + BEEM - EditSettings Activity + + BEEM - Créer un compte + BEEM - CreateAccount Activity + + BEEM - Contacts + BEEM - ContactList Activity + + + + Réinitialiser + Se connecter + Enregistrer + Créer ce compte + Créer et enregistrer + + + + Nom d'utilisateur + Mot de passe + + Connexion - Erreur + Fermer + + Créer un compte + Paramètres + À propos + + À propos + + BEEM est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com ! + + Fermer + + + + Créer un compte + Se connecter + + Les paramètres ont été enregistrés avec succès. + + beem_settings + 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 + Compte + + edit_settings_tab_xmpp + XMPP + + edit_settings_tab_proxy + Proxy + + + Nom d\'utilisateur + Mot de passe + Serveur + Port + + + + Serveur + Port + Utiliser SSL/TLS + + + Utiliser un proxy + Choisir un type de proxy + Serveur + Port + Nom d\'utilisateur + Mot de passe + + + Créer un compte - Instructions + Créer un compte - Erreur + Changer mes paramètres + Fermer + + + a été créé avec succès + Les mots de passe ne correspondent pas + + Nom d\'utilisateur + Mot de passe + Confirmer le mot de passe + + + Ajouter un contact + Paramètres + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values-fr/styles.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values-fr/styles.xml Fri Jun 26 09:39:19 2009 +0200 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff -r 5427deeda4e0 -r 9236b57675c9 res/values/arrays.xml --- a/res/values/arrays.xml Thu Jun 25 20:12:07 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - HTTP - SOCKS4 - SOCKS5 - - diff -r 5427deeda4e0 -r 9236b57675c9 res/values/colors.xml --- a/res/values/colors.xml Thu Jun 25 20:12:07 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - #A0C8FF - #000000 - #FFFFFF - \ No newline at end of file diff -r 5427deeda4e0 -r 9236b57675c9 res/values/strings.xml --- a/res/values/strings.xml Thu Jun 25 20:12:07 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,248 +0,0 @@ - - - Beem - Ok - Clear - Accept - Refuse - - - - Jabber ID - - - - Connecting... - - - - Use the Beem Service - BeemService Created - BeemService destroyed - - - - Beem - host - Jabber ID - login - password - service - port - proxy_host - proxy_port - use_proxy - proxy_type - proxy_user - proxy_password - None - HTTP - SOCKS4 - SOCKS5 - status - status_text - - - Server connection - Userid: - Password: - Service: - Host/Port: - Proxy informations - Login: - Ok - - - Chat - Alias - Resend suscription - User infos - Block user - Delete user - Are you sure you want to delete this contact? - - Yes - No - - - Login: - Email: - Password: - Repeat: - Ok - Log with - Bad form - Account created - - - Beem - Add contact - Login: - Alias: - Group: - Ok - Contact added - Error Contact not added - Error Login - Bad form - - - - 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 - - - Subscription accepted - Subscription error - Subscription refused - You have received a request for add by %s. Do you want to accept it ? - - - Not connected - - - You have got a new message - - - - - BEEM - Login Activity - - BEEM - Settings - BEEM - EditSettings Activity - - BEEM - Create an account - BEEM - CreateAccount Activity - - BEEM - Contacts - BEEM - ContactList Activity - - - - 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 - - - - Create an account - Login - - The settings have been saved successfully. - - beem_settings - 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 - Passwords do not match. - - Username - Password - Confirm password - - - Add a contact - Settings - - diff -r 5427deeda4e0 -r 9236b57675c9 res/values/styles.xml --- a/res/values/styles.xml Thu Jun 25 20:12:07 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - diff -r 5427deeda4e0 -r 9236b57675c9 src/com/beem/project/beem/service/Contact.java diff -r 5427deeda4e0 -r 9236b57675c9 src/com/beem/project/beem/ui/ContactList.java diff -r 5427deeda4e0 -r 9236b57675c9 src/com/beem/project/beem/ui/Login.java --- a/src/com/beem/project/beem/ui/Login.java Thu Jun 25 20:12:07 2009 +0200 +++ b/src/com/beem/project/beem/ui/Login.java Fri Jun 26 09:39:19 2009 +0200 @@ -18,7 +18,6 @@ import android.widget.TextView; import android.widget.Toast; -import com.beem.project.beem.BeemService; import com.beem.project.beem.R; import com.beem.project.beem.service.aidl.IBeemConnectionListener; import com.beem.project.beem.service.aidl.IXmppConnection;