Mercurial Mercurial > beem > trunk / 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.
remove some unused resources
authorDa Risk <da_risk@beem-project.com>
Tue, 25 Sep 2012 22:40:22 +0200
changeset 994 87c97dcb7136
parent 993 8e9ab434ef7d
child 995 6318bee856fd
remove some unused resources
res/layout/progress_dialog.xml file | annotate | diff | comparison | revisions
res/layout/wizard_account.xml file | annotate | diff | comparison | revisions
res/menu/create_account.xml file | annotate | diff | comparison | revisions
res/values-fr/strings.xml file | annotate | diff | comparison | revisions
res/values/arrays.xml file | annotate | diff | comparison | revisions
res/values/attrs.xml file | annotate | diff | comparison | revisions
res/values/strings.xml file | annotate | diff | comparison | revisions 
--- a/res/layout/progress_dialog.xml	Tue Sep 25 21:39:45 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content" android:layout_height="wrap_content"
-	>
-	<TextView android:id="@+id/title" 
-	    android:layout_width="fill_parent" android:layout_height="wrap_content" 
-	    android:layout_alignParentTop="true"
-	    android:text="TITLE" />
-	<View android:id="@+id/separator" android:layout_width="match_parent" android:layout_height="4dp"/>
-	
-	<ProgressBar android:id="@+id/progress" 
-	    android:layout_width="wrap_content" android:layout_height="wrap_content"
-	    android:layout_below="@+id/separator"
-	    android:layout_alignParentLeft="true" 
-	    android:indeterminateOnly="true" android:indeterminate="true" android:indeterminateBehavior="repeat"/>
-	<TextView android:id="@+id/message"
-	    android:layout_width="wrap_content" android:layout_height="wrap_content"
-	    android:layout_below="@+id/separator"
-	    android:layout_toRightOf="@id/progress" 
-	    android:text="TITLECONTENT"/>
-</RelativeLayout>
--- a/res/layout/wizard_account.xml	Tue Sep 25 21:39:45 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="fill_parent" android:layout_width="fill_parent"
-    android:orientation="vertical"
-    >
-	<LinearLayout android:layout_height="fill_parent" android:layout_width="fill_parent"
-	    android:orientation="vertical" >
-	    <ImageView android:id="@+id/logo"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_marginTop="15dp"
-		android:layout_marginBottom="30dp"
-		android:src="@drawable/logo"/>
-	    <FrameLayout
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:id="@+id/main_content" />
-	   
-	</LinearLayout>
-</ScrollView>
--- a/res/menu/create_account.xml	Tue Sep 25 21:39:45 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-</menu>
--- a/res/values-fr/strings.xml	Tue Sep 25 21:39:45 2012 +0200
+++ b/res/values-fr/strings.xml	Tue Sep 25 22:40:22 2012 +0200
@@ -14,16 +14,8 @@
 	<!--  AccountConfigure class -->
 	<string name="AccountConfigureManualConfiguration">Configuration manuelle</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>
 
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
@@ -40,22 +32,14 @@
 	<string name="AddCContactAdded">Contact ajouté</string>
 	<string name="AddCContactAddedError">Erreur Contact non ajouté</string>
 	<string name="AddCContactAddedLoginError">Mauvais nom d\'utilisateur</string>
-	<string name="AddCBadForm">Mauvais formulaire</string>
 	<string name="AddCContactAlready">Contact déjà ajouté</string>
 
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
 	<string name="ChangeStatusType">Mon statut</string>
-	<string name="ChangeStatusMessage">Mon message personnel</string>
 	<string name="OpenContactList">Ouvrir la liste des contacts</string>
 
-	
-	<string name="MenuAddContact">Ajouter un nouveau contact</string>
-	<string name="MenuAccountAbout">Beem Project</string>
-	<string name="MenuAccountCreate">Créer un compte</string>
-	<string name="MenuConnection">Modifier un compte</string>
 	<string name="ChangeStatusOk">Mise à jour du statut</string>
-	<string name="ChangeStatusNoChange">Rien à changer</string>
 	<string name="my_avatar">Mon avatar</string>
 	<string name="select_avatar">Choisissez votre avatar</string>
 	<string name="take_photo">Prendre une photo</string>
@@ -64,8 +48,6 @@
 	<string name="photoPickerNotFoundText">Sélecteur d\'image non disponible</string>
 
 	<!-- Settings class -->
-	<string name="SettingsText">Saisissez votre identifiant de connexion</string>
-	<string name="SettingsPassword">Saisissez votre mot de passe</string>
 	<string name="SettingsProxy">Proxy</string>
 	<string name="SettingsProxyProxy">Utiliser un proxy</string>
 	<string name="SettingsProxySummary">Connectez vous à travers un serveur proxy</string>
@@ -95,7 +77,6 @@
 	<string name="CLP_hidden_contact">Cachez les contacts déconnectés</string>
 	<string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les contacts déconnectés</string>
 	<string name="settings_account_username">Nom d\'utilisateur (JID)</string>
-	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Mot de passe</string>
 	<string name="settings_account_server">Serveur</string>
 	<string name="settings_account_port">Port</string>
@@ -129,8 +110,6 @@
 	<string name="settings_chat_compact_sum">Activer la fenetre Chat compact</string>
 	<string name="history">Historique</string>
 	<string name="history_sum">Cochez cette option pour enregistrer les discussions sur la SDCard</string>
-	<string name="history_mount">Il vous faut avoir une SDcard utilisable en écriture pour activer l\'historique</string>
-	<string name="history_on_off">Activer la l\'historique des messages</string>
 	<string name="chat_preferences">Chat</string>
 	<string name="chat_preferences_sum">Historique, taille de la fenêtre ...</string>
 	<string name="chat_history_path">Répertoire d\'historique</string>
@@ -146,9 +125,6 @@
 	<string name="SubscriptText">%s vient de vous ajouter à sa liste de contacts. Souhaitez-vous l\'autoriser ?</string>
 	<string name="SubscriptTitle">Autoriser ce contact ?</string>
 
-	<!--  BeemChatManager class -->
-	<string name="BeemChatManagerNewMessage">Vous avez reçu un nouveau message</string>
-
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">BEEM: Vous avez été déconnecté(e)</string>
 
@@ -163,30 +139,14 @@
 	<!--
     	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>
 	<string name="user_info_name">Beem - Informations</string>
 
 	<!--
-    	Buttons
-    -->
-	<string name="button_create_account">Créer ce compte</string>
-	<string name="button_create_login_account">Créer puis utiliser ce compte</string>
-
-
-	<!--
     	LogAs Activity
     -->
-	<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">A propos</string>
 	<string name="login_about_title">Beem %s - A propos</string>
@@ -195,13 +155,8 @@
 		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>
 	<string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>
-	<string name="login_error_msg">Malheureusement, une erreur est survenu.\n\nDétail
-		de l\'erreur :\n%s</string>
 	<string name="login_menu_login">Se connecter</string>
-	<string name="login_no_connectivity">Pas de connexion internet disponible</string>
 	<string name="login_start_msg">Configuration des informations dans le menu</string>
 
 	<!-- LoginAnim activity -->
@@ -236,18 +191,14 @@
 
 	<!-- wizard activities -->
 	<string name="account_wizard_text1"><b>Bienvenue sur BEEM.</b>\n\nVous n\'avez pas encore configuré de compte XMPP (Jabber).\nChoisissez une des options suivantes :</string>
-	<string name="account_wizard_configure_text"><b>Remplissez les informations pour votre compte</b></string>
-	<string name="account_wizard_configure_account">Je possède déjà un compte que je veux utiliser.</string>
+	<string name="account_wizard_configure_text_1">Utilisez un compte du terminal</string>
+	<string name="account_wizard_configure_text_2"><b>ou</b></string>
+	<string name="account_wizard_configure_text_3">Remplissez les informations de votre compte</string>	<string name="account_wizard_configure_account">Je possède déjà un compte que je veux utiliser.</string>
 	<string name="account_wizard_create_account">Je veux créer un nouveau compte</string>
 
 	<!--
 		Create an account Activity
 	-->
-	<string name="create_account_instr_dialog_title">Créer un compte - Instructions</string>
-	<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">L\'utilisateur %s a été créé avec succès</string>
 	<string name="create_account_err_username">Mauvais JabberID</string>
 	<string name="create_account_err_passwords">Les mots de passe ne correspondent pas</string>
 	<string name="create_account_username">Nom d\'utilisateur</string>
--- a/res/values/arrays.xml	Tue Sep 25 21:39:45 2012 +0200
+++ b/res/values/arrays.xml	Tue Sep 25 22:40:22 2012 +0200
@@ -18,11 +18,6 @@
 		<item>@string/pick_photo</item>
 		<item>@string/delete_avatar</item>
 	</string-array>
-	<string-array name="privacy_list_select_dialog">
-		<item name="@string/privacy_list_select_dialog_buddies">Buddies</item>
-		<item name="@string/privacy_list_select_dialog_groups">Groups</item>
-		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
-	</string-array>
 	<string-array name="loganim_state">
 		<item>@string/loganim_connecting</item>
 		<item>@string/loganim_authenticating</item>
--- a/res/values/attrs.xml	Tue Sep 25 21:39:45 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    BEEM is a videoconference application on the Android Platform.
-
-    Copyright (C) 2009-2011 by Frederic-Charles Barthelery,
-                               Nikita Kozlov,
-                               Vincent Veronis.
-
-    This file is part of BEEM.
-
-    BEEM is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    BEEM is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with BEEM.  If not, see <http://www.gnu.org/licenses/>.
-
-    Please send bug reports with examples or suggestions to
-    contact@beem-project.com or http://www.beem-project.com/
-
--->
-<resources>
-    <declare-styleable name="SectionTextView">
-        <attr name="principalColor" format="color" />
-        <attr name="nonPrincipalColor" format="color" />
-        <attr name="principalLineSize" format="dimension" />
-        <attr name="nonPrincipalLineSize" format="dimension" />
-    </declare-styleable>
-</resources>
--- a/res/values/strings.xml	Tue Sep 25 21:39:45 2012 +0200
+++ b/res/values/strings.xml	Tue Sep 25 22:40:22 2012 +0200
@@ -14,16 +14,8 @@
 	<!--  AccountConfigure class -->
 	<string name="AccountConfigureManualConfiguration">Manual Configuration</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>
 
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
@@ -40,21 +32,14 @@
 	<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>
 
 	<!--  ChangeStatus class -->
 	<string name="ChangeStatusActTitle">Beem - Change my status</string>
 	<string name="ChangeStatusType">My status</string>
-	<string name="ChangeStatusMessage">My personal message</string>
 	<string name="OpenContactList">Open contact list</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>
 	<string name="my_avatar">My avatar</string>
 	<string name="select_avatar">Choose your avatar</string>
 	<string name="take_photo">Take a photo</string>
@@ -64,8 +49,6 @@
 
 
 	<!-- Settings class -->
-	<string name="SettingsText">Edit your username</string>
-	<string name="SettingsPassword">Edit your password</string>
 	<string name="SettingsProxy">Proxy</string>
 	<string name="SettingsProxyProxy">Use a proxy server</string>
 	<string name="SettingsProxySummary">Login through a proxy server</string>
@@ -96,7 +79,6 @@
 	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 	</string>
 	<string name="settings_account_username">Username (JID)</string>
-	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Password</string>
 	<string name="settings_account_server">Server</string>
 	<string name="settings_account_port">Port</string>
@@ -130,8 +112,6 @@
 	<string name="settings_chat_compact_sum">Set the chat windows compact</string>
 	<string name="history">History</string>
 	<string name="history_sum">Check this to save chats on the SDCard</string>
-	<string name="history_mount">You need to have SDcard mounted and writable to enable history</string>
-	<string name="history_on_off">Enable history messages</string>
 	<string name="chat_preferences">Chat</string>
 	<string name="chat_preferences_sum">History, Layout size ...</string>
 	<string name="chat_history_path">History path</string>
@@ -147,9 +127,6 @@
 	<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>
 
-	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
-
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">BEEM: You have been disconnected</string>
 
@@ -158,25 +135,12 @@
 	<string name="AcceptContactRequestFrom">Authorize %s to contact you.</string>
 
 	<!-- 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_create_account">Create this account</string>
-	<string name="button_create_login_account">Create and use this account</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">Beem %s - About</string>
@@ -185,13 +149,8 @@
 		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>
 	<string name="login_menu_login">Login</string>
-	<string name="login_no_connectivity">No internet connection found</string>
 	<string name="login_start_msg">Settings configuration in menu</string>
 
 	<!-- LoginAnim activity -->
@@ -231,7 +190,7 @@
 	<string name="account_wizard_text1"><b>Welcome on BEEM.</b>\n\nYou have not configured an XMPP (Jabber) account yet.\nChoose one of the following options :</string>
 	<string name="account_wizard_configure_text_1">Use an account store on the device</string>
 	<string name="account_wizard_configure_text_2"><b>or</b></string>
-	<string name="account_wizard_configure_text_3">Please fill in the data for your existing account</string>
+	<string name="account_wizard_configure_text_3">Fill in the data for your existing account</string>
 	<string name="account_wizard_connection_failed"><b>Unable to authenticate your account. Please verify your credentials</b></string>
 	<string name="account_wizard_select_account_btn">Choose an account</string>
 	
@@ -239,11 +198,6 @@
 	<string name="account_wizard_create_account">I want to register for a new account</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">account %s 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>
BEEM