Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Little things
authorDa Risk <darisk972@gmail.com>
Fri, 26 Jun 2009 18:57:17 +0200
changeset 316 5efd53751e9e
parent 310 8d36c81dcd65
child 317 f930c6558d37
Little things
res/layout/login.xml file | annotate | diff | comparison | revisions
res/values-en/strings.xml file | annotate | diff | comparison | revisions
res/values-fr/strings.xml file | annotate | diff | comparison | revisions 
--- a/res/layout/login.xml	Fri Jun 26 18:32:58 2009 +0200
+++ b/res/layout/login.xml	Fri Jun 26 18:57:17 2009 +0200
@@ -11,9 +11,9 @@
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:gravity="bottom">
 		<Button android:id="@+id/log_as_settings" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:text="Settings" />
+			android:layout_height="wrap_content" android:text="@string/login_settings_button" />
 		<Button android:id="@+id/log_as_login" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:text="Login" />
+			android:layout_height="wrap_content" android:text="@string/login_login_button" />
 	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
--- a/res/values-en/strings.xml	Fri Jun 26 18:32:58 2009 +0200
+++ b/res/values-en/strings.xml	Fri Jun 26 18:57:17 2009 +0200
@@ -7,21 +7,17 @@
 	<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 the Beem Service</string>
 	<string name="BeemServiceCreated">BeemService Created</string>
 	<string name="BeemServiceDestroyed">BeemService destroyed</string>
 
 	<!--  Preferences informations -->
-
 	<string name="PreferenceFileName">Beem</string>
 	<string name="PreferenceHostKey">host</string>
 	<string name="PreferenceJID">Jabber ID</string>
@@ -86,7 +82,6 @@
 	<string name="AddCBadForm">Bad form</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>
@@ -102,12 +97,10 @@
 	<!--  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>
 	
@@ -157,19 +150,18 @@
     -->
 	<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>
 	
 	
 	<!--
@@ -177,9 +169,7 @@
 	-->
 	<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_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
@@ -196,10 +186,8 @@
 	<!-- 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>
 	
@@ -209,7 +197,6 @@
 	<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>
@@ -230,11 +217,8 @@
 	<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_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>
--- a/res/values-fr/strings.xml	Fri Jun 26 18:32:58 2009 +0200
+++ b/res/values-fr/strings.xml	Fri Jun 26 18:57:17 2009 +0200
@@ -7,21 +7,17 @@
 	<string name="RefuseButton">Refuser</string>
 
 	<!--  Beem class -->
-
 	<string name="BeemJabberID">Jabber ID</string>
 
 	<!--  BeemApplication class -->
-
 	<string name="BeemApplicationConnect">Connexion en cours...</string>
 
 	<!--  BeemService class -->
-
 	<string name="BeemServiceDescription">Utilisation du service BEEM</string>
 	<string name="BeemServiceCreated">BeemService Créé</string>
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
 	<!--  Preferences informations -->
-
 	<string name="PreferenceFileName">Beem</string>
 	<string name="PreferenceHostKey">host</string>
 	<string name="PreferenceJID">Jabber ID</string>
@@ -85,7 +81,6 @@
 	<string name="AddCBadForm">Mauvais formulaire</string>
 
 	<!--  SendIM class -->
-
 	<string name="SendIMActTitle">Beem - Chat</string>
 	<string name="SendIMSays"> %s dit :\n%s\n</string>
 	<string name="SendIMYouSay">Vous dites :\n%s\n</string>
@@ -101,12 +96,10 @@
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusText">Tapez votre message de statut ici :</string>
 	<string name="ChangeStatusActTitle">Beem - Changer statut</string>
-
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Créé un compte</string>
 	<string name="MenuConnection">Modifier compte</string>
-
 	<string name="ChangeStatusOk">Mise à jour du statut</string>
 	<string name="ChangeStatusNoChange">Rien à changer</string>
 	
@@ -130,16 +123,12 @@
     	Activities
     -->
     <string name="login_tag">BEEM - Activité de connexion</string>
-    
     <string name="edit_settings_name">BEEM - Paramètres</string>
 	<string name="edit_settings_tag">BEEM - EditSettings Activity</string>
-	
     <string name="create_account_name">BEEM - Créer un compte</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>
-
     
     <!--
     	Buttons
@@ -156,29 +145,25 @@
     -->
 	<string name="login_username">Nom d'utilisateur</string>
 	<string name="login_password">Mot de passe</string>
-	
 	<string name="login_error_dialog_title">Connexion - Erreur</string>
 	<string name="login_close_dialog_button">Fermer</string>
-	
 	<string name="login_menu_create_account">Créer un compte</string>
 	<string name="login_menu_settings">Paramètres</string>
 	<string name="login_menu_about">À propos</string>
-	
 	<string name="login_about_title">À propos</string>
 	<string name="login_about_msg">
 		BEEM est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Fermer</string>
-	
+	<string name="login_settings_button">Paramètres</string>
+	<string name="login_login_button">Connexion</string>	
 	
 	<!--
 		EditSettings Activity
 	-->
 	<string name="settings_menu_create_account">Créer un compte</string>
 	<string name="settings_menu_login">Se connecter</string>
-
 	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
-	
 	<string name="settings_filename">beem_settings</string>
 	<string name="settings_key_account_username">beem_account_username</string>
 	<string name="settings_key_account_password">beem_account_password</string>
@@ -195,10 +180,8 @@
 	<!-- EditSettings Activity tabs -->
 	<string name="settings_tab_tag_account">edit_settings_tab_account</string>
 	<string name="settings_tab_label_account">Compte</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>
 	
@@ -208,7 +191,6 @@
 	<string name="settings_account_server">Serveur</string>
 	<string name="settings_account_port">Port</string>
 	
-	
 	<!-- EditSettings Activity XMPP tab -->
 	<string name="settings_xmpp_server">Serveur</string>
 	<string name="settings_xmpp_port">Port</string>
@@ -229,11 +211,8 @@
 	<string name="create_account_err_dialog_title">Créer un compte - Erreur</string>
 	<string name="create_account_err_dialog_settings_button">Changer mes paramètres</string>
 	<string name="create_account_close_dialog_button">Fermer</string>
-
-	
 	<string name="create_account_successfull_after">a été créé avec succès</string>
 	<string name="create_account_err_passwords">Les mots de passe ne correspondent pas</string>
-	
 	<string name="create_account_username">Nom d\'utilisateur</string>
 	<string name="create_account_password">Mot de passe</string>
 	<string name="create_account_confirm_password">Confirmer le mot de passe</string>
BEEM-OTR