# HG changeset patch
# User Da Risk <da_risk@beem-project.com>
# Date 1426458061 -3600
# Node ID ba37a871aac23c6fc176197b40c5d94f1606f32b
# Parent  545219ce42c7f2cf8c789f4349fb6b160571ec39
Fix some lint errors

diff -r 545219ce42c7 -r ba37a871aac2 app/build.gradle
--- a/app/build.gradle	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/build.gradle	Sun Mar 15 23:21:01 2015 +0100
@@ -22,7 +22,7 @@
     lintOptions {
         abortOnError true
         textReport true
-        disable("MissingTranslation")
+        disable "MissingTranslation", "InvalidPackage"
     }
 
 }
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/aidl/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl
--- a/app/src/main/aidl/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl	Sun Mar 15 22:11:18 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-    BEEM is a videoconference application on the Android Platform.
-
-    Copyright (C) 2009 by Frederic-Charles Barthelery,
-                          Jean-Manuel Da Silva,
-                          Nikita Kozlov,
-                          Philippe Lago,
-                          Jean Baptiste Vergely,
-                          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://dev.beem-project.com/
-
-    Epitech, hereby disclaims all copyright interest in the program "Beem"
-    written by Frederic-Charles Barthelery,
-               Jean-Manuel Da Silva,
-               Nikita Kozlov,
-               Philippe Lago,
-               Jean Baptiste Vergely,
-               Vincent Veronis.
-
-    Nicolas Sadirac, November 26, 2009
-    President of Epitech.
-
-    Flavien Astraud, November 26, 2009
-    Head of the EIP Laboratory.
-
-*/
-package com.beem.project.beem.service.aidl;
-
-import  com.beem.project.beem.service.PrivacyListItem;
-import  com.beem.project.beem.service.aidl.IPrivacyListListener;
-
-interface IPrivacyListManager {
-	void createPrivacyList(in String listName, in List<PrivacyListItem> items);
-	void removePrivacyList(in String listName);
-	void editPrivacyList(in String listName, in List<PrivacyListItem> items);
-	String getActivePrivacyList();
-	String getDefaultPrivacyList();
-	void setActivePrivacyList(in String listName);
-	void setDefaultPrivacyList(in String listName);
-	void declineActivePrivacyList();
-	void declineDefaultPrivacyList();
-	List<String> getPrivacyLists();
-	void blockUser(in String listName, in String jid);
-	List<String> getBlockedUsersByList(in String listName);
-	List<String> getBlockedGroupsByList(in String listName);
-	void addPrivacyListListener(in IPrivacyListListener listener);
-	void removePrivacyListListener(in IPrivacyListListener listener);
-}
-
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppConnection.aidl
--- a/app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppConnection.aidl	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppConnection.aidl	Sun Mar 15 23:21:01 2015 +0100
@@ -46,7 +46,6 @@
 import  com.beem.project.beem.service.aidl.IRoster;
 import  com.beem.project.beem.service.aidl.IBeemConnectionListener;
 import  com.beem.project.beem.service.aidl.IChatManager;
-import  com.beem.project.beem.service.aidl.IPrivacyListManager;
 
 interface IXmppConnection {
 
@@ -73,7 +72,5 @@
 
     void changeStatus(in int status, in String msg);
 
-    IPrivacyListManager getPrivacyListManager();
-
     String getErrorMessage();
 }
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppFacade.aidl
--- a/app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppFacade.aidl	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/aidl/com/beem/project/beem/service/aidl/IXmppFacade.aidl	Sun Mar 15 23:21:01 2015 +0100
@@ -46,7 +46,6 @@
 import com.beem.project.beem.service.aidl.IXmppConnection;
 import com.beem.project.beem.service.aidl.IRoster;
 import com.beem.project.beem.service.aidl.IChatManager;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
 import com.beem.project.beem.service.PresenceAdapter;
 import com.beem.project.beem.service.UserInfo;
 
@@ -108,6 +107,4 @@
      * @return null if not connected
      */
     UserInfo getUserInfo();
-
-     IPrivacyListManager getPrivacyListManager();
 }
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/service/PrivacyListManagerAdapter.java
--- a/app/src/main/java/com/beem/project/beem/service/PrivacyListManagerAdapter.java	Sun Mar 15 22:11:18 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,358 +0,0 @@
-/*
-    BEEM is a videoconference application on the Android Platform.
-
-    Copyright (C) 2009 by Frederic-Charles Barthelery,
-                          Jean-Manuel Da Silva,
-                          Nikita Kozlov,
-                          Philippe Lago,
-                          Jean Baptiste Vergely,
-                          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://dev.beem-project.com/
-
-    Epitech, hereby disclaims all copyright interest in the program "Beem"
-    written by Frederic-Charles Barthelery,
-               Jean-Manuel Da Silva,
-               Nikita Kozlov,
-               Philippe Lago,
-               Jean Baptiste Vergely,
-               Vincent Veronis.
-
-    Nicolas Sadirac, November 26, 2009
-    President of Epitech.
-
-    Flavien Astraud, November 26, 2009
-    Head of the EIP Laboratory.
-
-*/
-package com.beem.project.beem.service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jivesoftware.smack.PrivacyList;
-import org.jivesoftware.smack.PrivacyListListener;
-import org.jivesoftware.smack.PrivacyListManager;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.packet.PrivacyItem;
-import org.jivesoftware.smack.packet.PrivacyItem.PrivacyRule;
-
-import android.os.RemoteCallbackList;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.beem.project.beem.service.aidl.IPrivacyListListener;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
-
-/**
- * An adapter for the Smack's PrivacyListManager.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
- */
-public class PrivacyListManagerAdapter extends IPrivacyListManager.Stub {
-
-    /** Class's Tag. */
-    public static final String TAG = "PrivacyListManagerAdapter";
-
-    private final PrivacyListManager mPrivacyListManager;
-
-    private final RemoteCallbackList<IPrivacyListListener> mPrivacyListListeners =
-	new RemoteCallbackList<IPrivacyListListener>();
-    private final PrivacyListListenerAdapter mPrivacyListListener = new PrivacyListListenerAdapter();
-
-    /**
-     * Constructor.
-     * @param privacyListManager the privacy list manager
-     */
-    public PrivacyListManagerAdapter(final PrivacyListManager privacyListManager) {
-	mPrivacyListManager = privacyListManager;
-	mPrivacyListManager.addListener(mPrivacyListListener);
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#blockUser(java.lang.String, java.lang.String)
-     */
-    @Override
-    public void blockUser(String listName, String jid) throws RemoteException {
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#createPrivacyList(java.lang.String, java.util.List)
-     */
-    @Override
-    public void createPrivacyList(String listName, List<PrivacyListItem> items) throws RemoteException {
-	Log.d(TAG, "BEGIN createPrivacyList.");
-	try {
-	    List<PrivacyItem> privacyItems = new ArrayList<PrivacyItem>();
-
-	    PrivacyItem item = new PrivacyItem(PrivacyItem.Type.subscription.name(), true, 2);
-	    item.setValue(PrivacyRule.SUBSCRIPTION_BOTH);
-	    privacyItems.add(item);
-
-	    mPrivacyListManager.createPrivacyList(listName, privacyItems);
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	Log.d(TAG, "END createPrivacyList.");
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#declineActivePrivacyList()
-     */
-    @Override
-    public void declineActivePrivacyList() throws RemoteException {
-	try {
-	    mPrivacyListManager.declineActiveList();
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#declineDefaultPrivacyList()
-     */
-    @Override
-    public void declineDefaultPrivacyList() throws RemoteException {
-	try {
-	    mPrivacyListManager.declineDefaultList();
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#editPrivacyList(java.lang.String, java.util.List)
-     */
-    @Override
-    public void editPrivacyList(String listName, List<PrivacyListItem> items) throws RemoteException {
-	Log.d(TAG, "BEGIN editPrivacyList.");
-	try {
-	    mPrivacyListManager.updatePrivacyList(listName, tranformPrivacyListItemsToPrivacyItems(items));
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	Log.d(TAG, "END editPrivacyList.");
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getActivePrivacyList()
-     */
-    @Override
-    public String getActivePrivacyList() throws RemoteException {
-	try {
-	    PrivacyList activePrivacyList = mPrivacyListManager.getActiveList();
-	    return activePrivacyList.toString();
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	return null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getBlockedGroupsByList(java.lang.String)
-     */
-    @Override
-    public List<String> getBlockedGroupsByList(String listName) throws RemoteException {
-	List<String> blockedGroups = new ArrayList<String>();
-	try {
-	    PrivacyList pL = mPrivacyListManager.getPrivacyList(listName);
-	    for (PrivacyItem pI : pL.getItems()) {
-		if (pI.getType().equals(PrivacyItem.Type.group) && !pI.isAllow())
-		    blockedGroups.add(pI.getValue());
-	    }
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	return blockedGroups;
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getBlockedUsersByList(java.lang.String)
-     */
-    @Override
-    public List<String> getBlockedUsersByList(String listName) throws RemoteException {
-	List<String> blockedUsers = new ArrayList<String>();
-	try {
-	    PrivacyList pL = mPrivacyListManager.getPrivacyList(listName);
-	    for (PrivacyItem pI : pL.getItems()) {
-		if (pI.getType().equals(PrivacyItem.Type.jid) && !pI.isAllow())
-		    blockedUsers.add(pI.getValue());
-	    }
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	return blockedUsers;
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getDefaultPrivacyList()
-     */
-    @Override
-    public String getDefaultPrivacyList() throws RemoteException {
-	try {
-	    PrivacyList defaultPrivacyList = mPrivacyListManager.getDefaultList();
-	    return defaultPrivacyList.toString();
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	return null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#removePrivacyList(java.lang.String)
-     */
-    @Override
-    public void removePrivacyList(String listName) throws RemoteException {
-	try {
-	    mPrivacyListManager.deletePrivacyList(listName);
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#setActivePrivacyList(java.lang.String)
-     */
-    @Override
-    public void setActivePrivacyList(String listName) throws RemoteException {
-	try {
-	    mPrivacyListManager.setActiveListName(listName);
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#setDefaultPrivacyList(java.lang.String)
-     */
-    @Override
-    public void setDefaultPrivacyList(String listName) throws RemoteException {
-	try {
-	    mPrivacyListManager.setDefaultListName(listName);
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-    }
-
-    /**
-     * From a List of PrivacyListItem get a List of PrivacyItem.
-     * @param items The List of PrivacyListItem.
-     * @return A list of PrivacyItem.
-     */
-    private List<PrivacyItem> tranformPrivacyListItemsToPrivacyItems(List<PrivacyListItem> items) {
-	List<PrivacyItem> rItems = new ArrayList<PrivacyItem>();
-	PrivacyItem.Type[] itemTypes = PrivacyItem.Type.values();
-
-	for (int i = 0; i < items.size(); i++) {
-	    rItems.add(new PrivacyItem(itemTypes[items.get(i).getType()].name(), false, i));
-	}
-
-	return rItems;
-    }
-
-    /**
-     * From a List of PrivacyItem get a List of PrivacyListItem.
-     * @param items The List of PrivacyItem.
-     * @return A list of PrivacyListItem.
-     */
-    private List<PrivacyListItem> tranformPrivacyItemsToPrivacyListItems(List<PrivacyItem> items) {
-	List<PrivacyListItem> rItems = new ArrayList<PrivacyListItem>();
-
-	for (int i = 0; i < items.size(); i++) {
-	    rItems.add(new PrivacyListItem(items.get(i).getType().ordinal(), items.get(i).getValue()));
-	}
-	return rItems;
-    }
-
-    /**
-     * An adapter for the Smack's PrivacyListListener.
-     * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
-     */
-    private class PrivacyListListenerAdapter implements PrivacyListListener {
-	/**
-	 * Constructor.
-	 */
-	public PrivacyListListenerAdapter() { }
-
-	@Override
-	public void setPrivacyList(final String listName, final List<PrivacyItem> listItem) {
-	    int i = mPrivacyListListeners.beginBroadcast();
-	    while (i > 0) {
-		i--;
-		try {
-		    mPrivacyListListeners.getBroadcastItem(i).setPrivacyList(listName,
-			tranformPrivacyItemsToPrivacyListItems(listItem));
-		} catch (RemoteException e) {
-		    Log.w(TAG, e.getMessage());
-		}
-	    }
-	    mPrivacyListListeners.finishBroadcast();
-	}
-
-	@Override
-	public void updatedPrivacyList(final String listName) {
-	    Log.d(TAG, "BEGIN updatedPrivacyList.");
-	    int i = mPrivacyListListeners.beginBroadcast();
-	    while (i > 0) {
-		i--;
-		try {
-		    mPrivacyListListeners.getBroadcastItem(i).updatedPrivacyList(listName);
-		} catch (RemoteException e) {
-		    Log.w(TAG, e.getMessage());
-		}
-	    }
-	    mPrivacyListListeners.finishBroadcast();
-	    Log.d(TAG, "END updatedPrivacyList.");
-	}
-    }
-
-    @Override
-    public void addPrivacyListListener(IPrivacyListListener listener) throws RemoteException {
-	if (listener != null)
-	    mPrivacyListListeners.register(listener);
-    }
-
-    @Override
-    public void removePrivacyListListener(IPrivacyListListener listener) throws RemoteException {
-	if (listener != null)
-	    mPrivacyListListeners.unregister(listener);
-    }
-
-    /* (non-Javadoc)
-     * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getPrivacyLists()
-     */
-    @Override
-    public List<String> getPrivacyLists() throws RemoteException {
-	Log.d(TAG, "BEGIN getPrivacyLists.");
-	List<String> res = new ArrayList<String>();
-	try {
-	    PrivacyList[] registeredPrivacyLists = mPrivacyListManager.getPrivacyLists();
-	    Log.d(TAG, "> registeredPrivacyLists size: " + registeredPrivacyLists.length);
-	    if (registeredPrivacyLists.length > 0) {
-		for (int i = 0; i < registeredPrivacyLists.length; i++) {
-		    res.add(registeredPrivacyLists[i].toString());
-		    Log.d(TAG, "> " + res.get(i) + " added.");
-		}
-	    }
-	} catch (XMPPException e) {
-	    Log.e(TAG, e.getMessage());
-	}
-	Log.d(TAG, "END getPrivacyLists.");
-	return res;
-    }
-}
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Mar 15 23:21:01 2015 +0100
@@ -114,7 +114,6 @@
     private int mPreviousPriority;
     private int mPreviousMode;
     private String mPreviousStatus;
-    private PrivacyListManagerAdapter mPrivacyListManager;
     private ChatStateManager mChatStateManager;
     private final BeemService mService;
     private BeemApplication mApplication;
@@ -253,9 +252,6 @@
 	    discoverServerFeatures();
 
 	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService, mAdaptee.getRoster());
-	    //nikita: I commented this line because of the logs provided in http://www.beem-project.com/issues/321
-	    //Also, since the privacylistmanager isn't finished and used, it will be safer to not initialize it
-	    //mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
 	    mService.initJingle(mAdaptee);
 
 	    mApplication.setConnected(true);
@@ -446,21 +442,6 @@
 	    mRemoteConnListeners.unregister(listen);
     }
 
-    /**
-     * PrivacyListManagerAdapter mutator.
-     * @param privacyListManager the privacy list manager
-     */
-    public void setPrivacyListManager(PrivacyListManagerAdapter privacyListManager) {
-	this.mPrivacyListManager = privacyListManager;
-    }
-
-    /**
-     * PrivacyListManagerAdapter accessor.
-     * @return the mPrivacyList
-     */
-    public PrivacyListManagerAdapter getPrivacyListManager() {
-	return mPrivacyListManager;
-    }
 
     /**
      * {@inheritDoc}
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/service/XmppFacade.java
--- a/app/src/main/java/com/beem/project/beem/service/XmppFacade.java	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/service/XmppFacade.java	Sun Mar 15 23:21:01 2015 +0100
@@ -48,7 +48,6 @@
 
 import com.beem.project.beem.BeemService;
 import com.beem.project.beem.service.aidl.IChatManager;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
 import com.beem.project.beem.service.aidl.IRoster;
 import com.beem.project.beem.service.aidl.IXmppConnection;
 import com.beem.project.beem.service.aidl.IXmppFacade;
@@ -137,15 +136,6 @@
 	return mConnexion.getRoster();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IPrivacyListManager getPrivacyListManager() {
-    	initConnection();
-	return mConnexion.getPrivacyListManager();
-    }
-
     @Override
     public void sendPresencePacket(PresenceAdapter presence) throws RemoteException {
     	initConnection();
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java
--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java	Sun Mar 15 23:21:01 2015 +0100
@@ -52,6 +52,7 @@
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.aidl.IRoster;
+import com.google.android.apps.iosched.util.LogUtils;
 
 /**
  * Use this builder to build a dialog which allows you to delete a contact from a specific roster.
@@ -59,7 +60,7 @@
  */
 public class DeleteContact extends AlertDialog.Builder {
 
-    private static final String TAG = "Dialogs.Builders > DeleteContact";
+    private static final String TAG = LogUtils.makeLogTag(DeleteContact.class);
 
     private IRoster mRoster;
     private Contact mContact;
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeletePrivacyList.java
--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeletePrivacyList.java	Sun Mar 15 22:11:18 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-    BEEM is a videoconference application on the Android Platform.
-
-    Copyright (C) 2009 by Frederic-Charles Barthelery,
-                          Jean-Manuel Da Silva,
-                          Nikita Kozlov,
-                          Philippe Lago,
-                          Jean Baptiste Vergely,
-                          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://dev.beem-project.com/
-
-    Epitech, hereby disclaims all copyright interest in the program "Beem"
-    written by Frederic-Charles Barthelery,
-               Jean-Manuel Da Silva,
-               Nikita Kozlov,
-               Philippe Lago,
-               Jean Baptiste Vergely,
-               Vincent Veronis.
-
-    Nicolas Sadirac, November 26, 2009
-    President of Epitech.
-
-    Flavien Astraud, November 26, 2009
-    Head of the EIP Laboratory.
-
-*/
-package com.beem.project.beem.ui.dialogs.builders;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.beem.project.beem.R;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
-
-/**
- * Use this builder to build a dialog which allows you to delete a privacy list.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
- */
-public class DeletePrivacyList extends AlertDialog.Builder {
-
-    private static final String TAG = "Dialogs.Builders > DeletePrivacyList";
-
-    private final IPrivacyListManager mPrivacyListManager;
-    private final String mPrivacyListName;
-
-    /**
-     * Constructor.
-     * @param context context activity.
-     * @param privacyListManager the privacy list manager managing the privacy list you want to delete.
-     * @param privacyListName the name of the privacy list you want to delete.
-     */
-    public DeletePrivacyList(final Context context, final IPrivacyListManager privacyListManager,
-	final String privacyListName) {
-	super(context);
-
-	mPrivacyListManager = privacyListManager;
-	mPrivacyListName = privacyListName;
-
-	setMessage(context.getString(R.string.privacy_list_delete_dialog_msg, privacyListName));
-	DialogClickListener dl = new DialogClickListener();
-	setPositiveButton(R.string.privacy_list_delete_dialog_yes, dl);
-	setNegativeButton(R.string.privacy_list_delete_dialog_no, dl);
-    }
-
-    /**
-     * Event click listener.
-     */
-    private class DialogClickListener implements DialogInterface.OnClickListener {
-
-	/**
-	 * Constructor.
-	 */
-	public DialogClickListener() {
-	}
-
-	@Override
-	public void onClick(final DialogInterface dialog, final int which) {
-	    if (which == DialogInterface.BUTTON_POSITIVE) {
-		try {
-		    mPrivacyListManager.removePrivacyList(mPrivacyListName);
-		} catch (RemoteException e) {
-		    Log.e(TAG, e.getMessage());
-		}
-	    }
-	}
-    }
-}
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java
--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java	Sun Mar 15 23:21:01 2015 +0100
@@ -43,6 +43,9 @@
 */
 package com.beem.project.beem.ui.dialogs.builders;
 
+import static com.google.android.apps.iosched.util.LogUtils.makeLogTag;
+
+import com.google.android.apps.iosched.util.LogUtils;
 import org.jivesoftware.smack.packet.Presence;
 
 import android.app.AlertDialog;
@@ -63,7 +66,7 @@
  */
 public class ResendSubscription extends AlertDialog.Builder {
 
-    private static final String TAG = "Dialogs.Builders > ResendSubscription";
+    private static final String TAG = makeLogTag(ResendSubscription.class);
 
     private Context mContext;
     private IXmppFacade mXmppFacade;
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-de/strings.xml
--- a/app/src/main/res/values-de/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-de/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">Manuelle Konfiguration</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber ID</string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">Verbinden...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">Benutze Beem Service</string>
-<string name="BeemServiceCreated">Beem Service erstellt</string>
-<string name="BeemServiceDestroyed">Beem Service verworfen</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">Chatten</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">Kontakt hinzugefügt</string>
 <string name="AddCContactAddedError">Fehler, Benutzer nicht hinzugefügt</string>
 <string name="AddCContactAddedLoginError">Fehler bei der Anmeldung</string>
-<string name="AddCBadForm">Mangelhafte Form</string>
 <string name="AddCContactAlready">Kontakt existiert bereits</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">Meine persönliche Nachricht</string>
 <string name="OpenContactList">Kontaktliste öffnen</string>
 
-<string name="MenuAddContact">Kontakt hinzufügen</string>
-<string name="MenuAccountAbout">Beem Project</string>
-<string name="MenuAccountCreate">Konto erstellen</string>
-<string name="MenuConnection">Konto bearbeiten</string>
 <string name="ChangeStatusOk">Aktualisiere Status</string>
-<string name="ChangeStatusNoChange">Nichts zu ändern</string>
 <string name="my_avatar">Mein Avatar</string>
 <string name="select_avatar">Wähle Avatar</string>
 <string name="take_photo">Foto machen</string>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">Benutzername bearbeiten</string>
-<string name="SettingsPassword">Passwort bearbeiten</string>
 <string name="SettingsProxy">Proxy</string>
 <string name="SettingsProxyProxy">Benutze einen Proxyserver</string>
 <string name="SettingsProxySummary">Anmeldung über einen Proxyserver</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">Benutzername (JID)</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">Passwort</string>
 <string name="settings_account_server">Server</string>
 <string name="settings_account_port">Port</string>
@@ -128,8 +111,6 @@
 <string name="settings_chat_compact_sum">Benutze kompakte Chatfenster</string>
 <string name="history">Chronik</string>
 <string name="history_sum">Aktivieren, um Unterhaltungen auf die Speicherkarte zu speichern</string>
-<string name="history_mount">Die Speicherkarte muss eingehängt und beschreibbar sein, um die Chronik zu aktivieren</string>
-<string name="history_on_off">Aktiviere Nachrichtenchronik</string>
 <string name="chat_preferences">Chat</string>
 <string name="chat_preferences_sum">Chronik, Layout Größe ...</string>
 <string name="chat_history_path">Chronik Pfad</string>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s will dich zu seiner/ihrer Kontaktliste hinzufügen. Willst du ihn/sie authorisieren?</string>
 <string name="SubscriptTitle">Kontakt authorisieren?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">Du hast eine neue Nachricht</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM: Die Verbindung wurde getrennt</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">Authorisiere %s dich zu kontaktieren.</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - Anmeldung</string>
 <string name="edit_settings_name">Beem - Einstellungen</string>
-<string name="edit_settings_tag">Beem - Einstellungen bearbeiten</string>
 <string name="create_account_name">Beem - Konto erstellen</string>
-<string name="create_account_tag">Beem - Konto erstellen</string>
 <string name="contact_list_name">Beem - Kontakte</string>
-<string name="contact_list_tag">Beem - Kontaktliste</string>
 <string name="user_info_name">Beem - Benutzerinformation</string>
 
-<!-- Buttons -->
-<string name="button_create_account">Dieses Konto erstellen</string>
-<string name="button_create_login_account">Dieses Konto erstellen und benutzen</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">Benutzername</string>
-<string name="login_password">Passwort</string>
-<string name="login_error_dialog_title">Anmeldung - Fehler</string>
-<string name="login_close_dialog_button">Schließen</string>
-<string name="login_menu_create_account">Konto erstellen</string>
 <string name="login_menu_settings">Einstellungen</string>
 <string name="login_menu_about">Über</string>
 <string name="login_about_title">Beem %s - Über</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">Schließen</string>
-<string name="login_settings_button">Einstellungen</string>
-<string name="login_login_button">Anmelden</string>
 <string name="login_login_progress">Verbinden. Bitte warten...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">Anmelden</string>
-<string name="login_no_connectivity">Keine Internetverbindung gefunden</string>
 <string name="login_start_msg">Konfiguration der Einstellungen im Menü</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>Willkommen bei BEEM.</b>nnDu hast noch kein XMPP (Jabber) Konto konfiguriert. Wähle eine der folgenden Optionen:</string>
-<string name="account_wizard_configure_text"><b>Bitte trage die Zugangsdaten für dein vorhandenes Konto ein</b></string>
 <string name="account_wizard_configure_account">Ich habe bereits ein Konto, das ich benutzen will</string>
 <string name="account_wizard_create_account">Ich möchte ein neues Konto registrieren</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">Konto erstellen - Anweisungen</string>
-<string name="create_account_err_dialog_title">Konto erstellen - Fehler</string>
-<string name="create_account_err_dialog_settings_button">Einstellungen ändern</string>
-<string name="create_account_close_dialog_button">Schließen</string>
-<string name="create_account_successfull_after">Das Konto %s wurde erfolgreich erstellt</string>
 <string name="create_account_err_username">Mangelhafte Jabber ID</string>
 <string name="create_account_err_passwords">Passwörter stimmen nicht überein.</string>
 <string name="create_account_username">Benutzername</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-es/strings.xml
--- a/app/src/main/res/values-es/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-es/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">Configuración manual</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber ID</string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">Conectando...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">Usar el servicio Beem</string>
-<string name="BeemServiceCreated">Servicio Beem creado</string>
-<string name="BeemServiceDestroyed">Servicio Beem suprimido</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">Charla</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">Contacto añadido</string>
 <string name="AddCContactAddedError">Error al añadir contacto</string>
 <string name="AddCContactAddedLoginError">Error en el login</string>
-<string name="AddCBadForm">Formulario incorrecto</string>
 <string name="AddCContactAlready">El contacto ya existe</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">Mi mensaje personal</string>
 <string name="OpenContactList">Abrir lista de contactos</string>
 
-<string name="MenuAddContact">Añadir contacto</string>
-<string name="MenuAccountAbout">Proyecto Beem</string>
-<string name="MenuAccountCreate">Crear cuenta</string>
-<string name="MenuConnection">Editar cuenta</string>
 <string name="ChangeStatusOk">Actualizando estado</string>
-<string name="ChangeStatusNoChange">Nada que cambiar</string>
 <string name="my_avatar">Mi avatar</string>
 <string name="select_avatar">Escoja su avatar</string>
 <string name="take_photo">Tomar una foto</string>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">Editar su usuario</string>
-<string name="SettingsPassword">Editar su contraseña</string>
 <string name="SettingsProxy">Proxy</string>
 <string name="SettingsProxyProxy">Usar un servidor proxy</string>
 <string name="SettingsProxySummary">Iniciar a través de un servidor proxy</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">Nombre de usuario (JID)</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">Contraseña</string>
 <string name="settings_account_server">Servidor</string>
 <string name="settings_account_port">Puerto</string>
@@ -128,8 +111,6 @@
 <string name="settings_chat_compact_sum">Establecer las ventanas de charla en modo compacto</string>
 <string name="history">Historial</string>
 <string name="history_sum">Tilda esto para guardar las conversaciones en la tarjeta SD</string>
-<string name="history_mount">Se necesita una tarjeta SD montada y escribible para habilitar el historial</string>
-<string name="history_on_off">Habilitar historial de mensajes</string>
 <string name="chat_preferences">Charla</string>
 <string name="chat_preferences_sum">Historial, tamaño de la distribución visual...</string>
 <string name="chat_history_path">Ruta al historial</string>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s desea agregarlo/a a su lista de contactos. ¿Desea autorizarlo/a ?</string>
 <string name="SubscriptTitle">¿Autorizar contacto?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">Tienes un nuevo mensaje</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM: Ha sido desconectado</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">Autorice a %s para que lo contacte.</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - Actividad inicio</string>
 <string name="edit_settings_name">Beem - Configuración</string>
-<string name="edit_settings_tag">Beem - Actividad editar configuración</string>
 <string name="create_account_name">Beem - Crear una cuenta</string>
-<string name="create_account_tag">Beem - Actividad creación cuenta</string>
 <string name="contact_list_name">Beem - Contactos</string>
-<string name="contact_list_tag">Beem - Actividad lista contactos</string>
 <string name="user_info_name">Beem - Información de usuario</string>
 
-<!-- Buttons -->
-<string name="button_create_account">Crear esta cuenta</string>
-<string name="button_create_login_account">Crear y usar esta cuenta</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">Usuario</string>
-<string name="login_password">Contraseña</string>
-<string name="login_error_dialog_title">Inicio sesión - Error</string>
-<string name="login_close_dialog_button">Cerrar</string>
-<string name="login_menu_create_account">Crear una cuenta</string>
 <string name="login_menu_settings">Configuración</string>
 <string name="login_menu_about">Acerca de</string>
 <string name="login_about_title">Beem %s - Acerca de</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">Cerrar</string>
-<string name="login_settings_button">Configuración</string>
-<string name="login_login_button">Inicio</string>
 <string name="login_login_progress">Conectando. Espere por favor ...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">Iniciar sesión</string>
-<string name="login_no_connectivity">No se detecto una conexión a internet</string>
 <string name="login_start_msg">Configuración de parametros en menú</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>Bienvenido a BEEM.</b>\n\nTodavía no ha configurado su cuenta XMPP (Jabber).\nEscoja una de las siguientes opciones:</string>
-<string name="account_wizard_configure_text"><b>Por favor, complete con la información de su cuenta existente</b></string>
 <string name="account_wizard_configure_account">Ya tengo una cuenta y deseo utilizarla</string>
 <string name="account_wizard_create_account">Deseo registrar una nueva cuenta</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">Crear cuenta - Instrucciones</string>
-<string name="create_account_err_dialog_title">Crear cuenta - Error</string>
-<string name="create_account_err_dialog_settings_button">Cambiar mi configuración</string>
-<string name="create_account_close_dialog_button">Cerrar</string>
-<string name="create_account_successfull_after">la cuenta %s fue creada correctamente</string>
 <string name="create_account_err_username">JabberID incorrecto </string>
 <string name="create_account_err_passwords">La clave no coincide</string>
 <string name="create_account_username">Usuario</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-it/strings.xml
--- a/app/src/main/res/values-it/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-it/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 	<!--  AccountConfigure class -->
 	<string name="AccountConfigureManualConfiguration">Configurazione Manuale</string>
 
-	<!--  Beem class -->
-	<string name="BeemJabberID">Jabber ID</string>
-
-	<!--  BeemApplication class -->
-	<string name="BeemApplicationConnect">Connessione...</string>
-
 	<!--  BeemService class -->
 	<string name="BeemServiceDescription">Usa il sservizio Beem</string>
-	<string name="BeemServiceCreated">Create il servizio Bemm</string>
-	<string name="BeemServiceDestroyed">Rimosso il servizio Beem</string>
 
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
@@ -40,7 +32,6 @@
 	<string name="AddCContactAdded">Aggiunto contatto</string>
 	<string name="AddCContactAddedError">Errore Contatto non aggiunto</string>
 	<string name="AddCContactAddedLoginError">Errore di accesso</string>
-	<string name="AddCBadForm">Forma errata</string>
 	<string name="AddCContactAlready">Contatto già esistente</string>
 
 	<!--  ChangeStatus class -->
@@ -49,16 +40,9 @@
 	<string name="ChangeStatusMessage">Messaggio personale</string>
 	<string name="OpenContactList">Apri lista contatti</string>
 	
-	<string name="MenuAddContact">Aggiungi un nuovo cotatto</string>
-	<string name="MenuAccountAbout">Progetto Beem</string>
-	<string name="MenuAccountCreate">Crea un account</string>
-	<string name="MenuConnection">Modifica account</string>
 	<string name="ChangeStatusOk">Aggiornamento stato</string>
-	<string name="ChangeStatusNoChange">Nessun cambiamento</string>
 
 	<!-- Settings class -->
-	<string name="SettingsText">Modifica il tuo username</string>
-	<string name="SettingsPassword">Modifica la tua password</string>
 	<string name="SettingsProxy">Proxy</string>
 	<string name="SettingsProxyProxy">Usa un server proxy</string>
 	<string name="SettingsProxySummary">Accedi attraverso un server proxy</string>
@@ -87,7 +71,6 @@
 	<string name="CLP_hidden_contact_sum">Abilita quest\'opzione per nascondere gli amici non connessi
 	</string>
 	<string name="settings_account_username">Username</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">Porta</string>
@@ -126,9 +109,6 @@
 	<string name="SubscriptText">%s desidera aggiungerti nella sua lista di amicizie. Vuoi autorizzarlo/a?</string>
 	<string name="SubscriptTitle">Autorizza amicizia ?</string>
 
-	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">Hai un nuovo messaggio</string>
-
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">BEEM: sei stato disconnesso</string>
 
@@ -137,25 +117,12 @@
 	<string name="AcceptContactRequestFrom">Autorizza %s a contattarti.</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">Crea questo account</string>
-	<string name="button_create_login_account">Crea ed usa questo account</string>
-
 	<!-- LogAs Activity -->
-	<string name="login_username">Username</string>
-	<string name="login_password">Password</string>
-	<string name="login_error_dialog_title">Accesso - Errore</string>
-	<string name="login_close_dialog_button">Chiudi</string>
-	<string name="login_menu_create_account">Crea un account</string>
 	<string name="login_menu_settings">Impostazioni</string>
 	<string name="login_menu_about">Informazioni su</string>
 	<string name="login_about_title">Beem %s - Informazioni</string>
@@ -164,13 +131,8 @@
 		http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Chiudi</string>
-	<string name="login_settings_button">Impostazioni</string>
-	<string name="login_login_button">Accedi</string>
 	<string name="login_login_progress">Connessione in corso. Attendere...</string>
-	<string name="login_error_msg">Purtroppo, si è verificato un errore.\n\nDettagli
-		errore:\n%s</string>
 	<string name="login_menu_login">Accedi</string>
-	<string name="login_no_connectivity">Non è stata trovata la connessione internet</string>
 	<string name="login_start_msg">Impostazioni di configurazione nel menuSettings configuration in menu</string>
 
 	<!-- LoginAnim activity -->
@@ -205,16 +167,10 @@
 
 	<!-- wizard activities -->
 	<string name="account_wizard_text1"><b>Benvenuto su BEEM.</b>\n\nNon hai ancora configurato un account XMPP (Jabber).\nScegli una delle seguenti opzioni :</string>
-	<string name="account_wizard_configure_text"><b>Si prega di compilare i dati per il vostro account esistente</b></string>
 	<string name="account_wizard_configure_account">Possiedo già un account che voglio</string>
 	<string name="account_wizard_create_account">Voglio registrare un nuovo account</string>
 
 	<!-- Create an account Activity -->
-	<string name="create_account_instr_dialog_title">Crea un account - Istruzioni</string>
-	<string name="create_account_err_dialog_title">Crea un account - Errore</string>
-	<string name="create_account_err_dialog_settings_button">Cambia le mie impostazioni</string>
-	<string name="create_account_close_dialog_button">Chiudi</string>
-	<string name="create_account_successfull_after">account %s è stato creato con successo</string>
 	<string name="create_account_err_username">Errato JabberID</string>
 	<string name="create_account_err_passwords">Le password non coincidono.</string>
 	<string name="create_account_username">Username</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-nb/strings.xml
--- a/app/src/main/res/values-nb/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-nb/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">Manuelt oppsett</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber-ID</string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">Kobler til ...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">Bruk Beem tjeneste </string>
-<string name="BeemServiceCreated">Beem tjeneste opprettet</string>
-<string name="BeemServiceDestroyed">Beem tjeneste slettet</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">Prat</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">Kontakt lagt til</string>
 <string name="AddCContactAddedError">Feil ved lagring av kontakt</string>
 <string name="AddCContactAddedLoginError">Feil ved innlogging</string>
-<string name="AddCBadForm">Feil utfylt</string>
 <string name="AddCContactAlready">Kontakten finnes allerede</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">Min personlige melding</string>
 <string name="OpenContactList">Åpne kontaktlista</string>
 
-<string name="MenuAddContact">Legg til ny kontakt</string>
-<string name="MenuAccountAbout">Beem-prosjektet</string>
-<string name="MenuAccountCreate">Opprett konto</string>
-<string name="MenuConnection">Rediger konto</string>
 <string name="ChangeStatusOk">Oppdaterer status</string>
-<string name="ChangeStatusNoChange">Ingen endringer</string>
 <string name="my_avatar">Mitt personbilde</string>
 <string name="select_avatar">Velg ditt personbilde</string>
 <string name="take_photo">Ta et bilde</string>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">Rediger brukernavn</string>
-<string name="SettingsPassword">Rediger passord</string>
 <string name="SettingsProxy">Mellomtjener</string>
 <string name="SettingsProxyProxy">Bruk en mellomtjener</string>
 <string name="SettingsProxySummary">Logg inn via en mellomtjener</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">Brukernavn (JID)</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">Passord</string>
 <string name="settings_account_server">Tjener</string>
 <string name="settings_account_port">Port</string>
@@ -128,8 +111,6 @@
 <string name="settings_chat_compact_sum">Velg kompakt pratevindu</string>
 <string name="history">Historikk</string>
 <string name="history_sum">Aktiver for å lagre meldinger på minnekortet</string>
-<string name="history_mount">Du trenger et montert og skrivebart minnekort for å kunne aktivere historikk</string>
-<string name="history_on_off">Aktiver historikk</string>
 <string name="chat_preferences">Prat</string>
 <string name="chat_preferences_sum">Historikk, utseende ...</string>
 <string name="chat_history_path">Sti til historikk</string>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s ønsker å legge deg til sin kontaktliste. Godkjenne forespørselen?</string>
 <string name="SubscriptTitle">Godkjenne kontakt?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">Du har en ny melding</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM: du har koblet fra</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">Godkjenn at %s kontakter deg</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - Aktivitet innlogging</string>
 <string name="edit_settings_name">Beem - Innstillinger</string>
-<string name="edit_settings_tag">Beem - Aktivitet innstillinger</string>
 <string name="create_account_name">Beem - Opprett konto</string>
-<string name="create_account_tag">Beem - Aktivitet opprett konto</string>
 <string name="contact_list_name">Beem - Kontakter</string>
-<string name="contact_list_tag">Beem - Aktivitet kontaktliste</string>
 <string name="user_info_name">Beem - Brukerinformasjon</string>
 
-<!-- Buttons -->
-<string name="button_create_account">Opprett kontoen</string>
-<string name="button_create_login_account">Opprett og bruk kontoen</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">Brukernavn</string>
-<string name="login_password">Passord</string>
-<string name="login_error_dialog_title">Feil ved innlogging</string>
-<string name="login_close_dialog_button">Lukk</string>
-<string name="login_menu_create_account">Opprett konto</string>
 <string name="login_menu_settings">Innstillinger</string>
 <string name="login_menu_about">Om</string>
 <string name="login_about_title">Beem %s - Om</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">Lukk</string>
-<string name="login_settings_button">Innstillinger</string>
-<string name="login_login_button">Logg inn</string>
 <string name="login_login_progress">Kobler til ...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">Innlogging</string>
-<string name="login_no_connectivity">Ingen nettforbindelse funnet</string>
 <string name="login_start_msg">Innstillinger i menyen</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>Velkomment til BEEM.</b>nnDu har ikke satt opp en XMPP (Jabber) konto.nVelg et av følgende alternativ :</string>
-<string name="account_wizard_configure_text"><b>Fyll inn informasjon for din eksisterende konto</b></string>
 <string name="account_wizard_configure_account">Jeg har en konto som jeg ønsker å bruke</string>
 <string name="account_wizard_create_account">Jeg ønsker å registrer en ny konto</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">Opprett en konto - Veiledning</string>
-<string name="create_account_err_dialog_title">Opprett en konto - Feil</string>
-<string name="create_account_err_dialog_settings_button">Endre innstillinger</string>
-<string name="create_account_close_dialog_button">Lukk</string>
-<string name="create_account_successfull_after">Konto %s opprettet</string>
 <string name="create_account_err_username">Ugyldig JabberID</string>
 <string name="create_account_err_passwords">Passordene er ikke like</string>
 <string name="create_account_username">Brukernavn</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-pt/strings.xml
--- a/app/src/main/res/values-pt/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-pt/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 	<!--  AccountConfigure class -->
 	<string name="AccountConfigureManualConfiguration">Configuração Manual</string>
 
-	<!--  Beem class -->
-	<string name="BeemJabberID">Jabber ID</string>
-
-	<!--  BeemApplication class -->
-	<string name="BeemApplicationConnect">Conectando...</string>
-
 	<!--  BeemService class -->
 	<string name="BeemServiceDescription">Utilizar Serviço Beem</string>
-	<string name="BeemServiceCreated">Serviço Beem Criado</string>
-	<string name="BeemServiceDestroyed">Serviço Beem Destruído</string>
 
 	<!--  ContactDialog class -->
 	<string name="CDChat">Conversa</string>
@@ -40,7 +32,6 @@
 	<string name="AddCContactAdded">Contato Adicionado</string>
 	<string name="AddCContactAddedError">Erro: Contato não adicionado</string>
 	<string name="AddCContactAddedLoginError">Erro de login</string>
-	<string name="AddCBadForm">Jabber ID mal formado</string>
 	<string name="AddCContactAlready">Contato já existe</string>
 
 	<!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 	<string name="ChangeStatusMessage">Minha mensagem pessoal</string>
 	<string name="OpenContactList">Abrir lista de contatos</string>
 	
-	<string name="MenuAddContact">Adicionar contato</string>
-	<string name="MenuAccountAbout">Projeto Beem</string>
-	<string name="MenuAccountCreate">Criar conta</string>
-	<string name="MenuConnection">Editar conta</string>
 	<string name="ChangeStatusOk">Atualizando status</string>
-	<string name="ChangeStatusNoChange">Nada a alterar</string>
 	<string name="my_avatar">Meu avatar</string>
 	<string name="select_avatar">Escolha o seu avatar</string>
 	<string name="take_photo">Tirar uma foto</string>
@@ -64,8 +50,6 @@
 
 
 	<!-- Settings class -->
-	<string name="SettingsText">Editar seu login</string>
-	<string name="SettingsPassword">Editar sua senha</string>
 	<string name="SettingsProxy">Proxy</string>
 	<string name="SettingsProxyProxy">Usar um servidor de proxy</string>
 	<string name="SettingsProxySummary">Efetuar login através de um proxy</string>
@@ -94,7 +78,6 @@
 	<string name="CLP_hidden_contact_sum">Marque essa opção para ocultar contatos desconectados
 	</string>
 	<string name="settings_account_username">Login (JID)</string>
-	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Senha</string>
 	<string name="settings_account_server">Servidor</string>
 	<string name="settings_account_port">Porta</string>
@@ -128,8 +111,6 @@
 	<string name="settings_chat_compact_sum">Habilita o modo compacto da janela de chat</string>
 	<string name="history">Histórico</string>
 	<string name="history_sum">Marque se você deseja gravar o histórico de conversas no seu cartão SD</string>
-	<string name="history_mount">Você precisa ter um cartão SD montado e com permissão de escrita para habilitar o histórico</string>
-	<string name="history_on_off">Habilita histórico de mensagens</string>
 	<string name="chat_preferences">Conversa</string>
 	<string name="chat_preferences_sum">Histórico, Tamanho do layout ...</string>
 	<string name="chat_history_path">Caminho do histórico</string>
@@ -145,9 +126,6 @@
 	<string name="SubscriptText">%s quer te adicionar como contato. Você autoriza?</string>
 	<string name="SubscriptTitle">Autorizar contato?</string>
 
-	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">Você tem uma nova mensagem</string>
-
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">BEEM: Você foi desconectado</string>
 
@@ -156,25 +134,12 @@
 	<string name="AcceptContactRequestFrom">Autorizar %s para contactar você.</string>
 
 	<!-- Activities -->
-	<string name="login_tag">Beem - Atividade de login</string>
 	<string name="edit_settings_name">Beem - Configurações</string>
-	<string name="edit_settings_tag">Beem - Atividade de configurações</string>
 	<string name="create_account_name">Beem - Criar uma conta</string>
-	<string name="create_account_tag">Beem - Atividade de criar conta</string>
 	<string name="contact_list_name">Beem - Lista de contatos</string>
-	<string name="contact_list_tag">Beem - Atividade de lista de contatos</string>
 	<string name="user_info_name">Beem - Informações de usuário</string>
 
-	<!-- Buttons -->
-	<string name="button_create_account">Criar conta</string>
-	<string name="button_create_login_account">Criar e utilizar conta</string>
-
 	<!-- LogAs Activity -->
-	<string name="login_username">Login</string>
-	<string name="login_password">Senha</string>
-	<string name="login_error_dialog_title">Login - Erro</string>
-	<string name="login_close_dialog_button">Fechar</string>
-	<string name="login_menu_create_account">Criar conta</string>
 	<string name="login_menu_settings">Configurações</string>
 	<string name="login_menu_about">Sobre</string>
 	<string name="login_about_title">Beem %s - Sobre</string>
@@ -183,13 +148,8 @@
 		http://www.beem-project.com !
 	</string>
 	<string name="login_about_button">Fechar</string>
-	<string name="login_settings_button">Configurações</string>
-	<string name="login_login_button">Entrar</string>
 	<string name="login_login_progress">Conectando. Aguarde...</string>
-	<string name="login_error_msg">Infelizmente, ocorreu um erro.\n\nDetalhes
-		do erro:\n%s</string>
 	<string name="login_menu_login">Login</string>
-	<string name="login_no_connectivity">Conexão de internet não encontrada</string>
 	<string name="login_start_msg">Configurações incorretas</string>
 
 	<!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 	<!-- wizard activities -->
 	<string name="account_wizard_text1"><b>Bem vindo ao BEEM.</b>\n\nVocê ainda não configurou uma conta XMPP (Jabber).\nEscolha uma das opções :</string>
-	<string name="account_wizard_configure_text"><b>Por favor, preencha os dados da sua conta</b></string>
 	<string name="account_wizard_configure_account">Eu já tenho uma conta</string>
 	<string name="account_wizard_create_account">Quero criar uma conta</string>
 
 	<!-- Create an account Activity -->
-	<string name="create_account_instr_dialog_title">Criar conta - Instruções</string>
-	<string name="create_account_err_dialog_title">Criar conta - Erro</string>
-	<string name="create_account_err_dialog_settings_button">Alterar configurações</string>
-	<string name="create_account_close_dialog_button">Fechar</string>
-	<string name="create_account_successfull_after">conta %s foi criada com sucesso</string>
 	<string name="create_account_err_username">JabberID mal formado</string>
 	<string name="create_account_err_passwords">Senha não confere.</string>
 	<string name="create_account_username">Login</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-ru/strings.xml
--- a/app/src/main/res/values-ru/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-ru/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">Ручная конфигурация</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber ID</string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">Соединение...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">Использовать сервис Beem</string>
-<string name="BeemServiceCreated">Сервис Beem создан</string>
-<string name="BeemServiceDestroyed">Сервис Beem уничтожен</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">Написать</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">Контакт добавлен</string>
 <string name="AddCContactAddedError">Ошибка добавления контакта</string>
 <string name="AddCContactAddedLoginError">Ошибка входа</string>
-<string name="AddCBadForm"/>
 <string name="AddCContactAlready">Контакт уже добавлен</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">Персональное сообщение</string>
 <string name="OpenContactList">Открыть список контактов</string>
 
-<string name="MenuAddContact">Добавить новый контакт</string>
-<string name="MenuAccountAbout">О проекте Beem</string>
-<string name="MenuAccountCreate">Создать аккаунт</string>
-<string name="MenuConnection">Изменить аккаунт</string>
 <string name="ChangeStatusOk">Обновление статуса...</string>
-<string name="ChangeStatusNoChange">Ничего не изменилось</string>
 <string name="my_avatar">Мой аватар</string>
 <string name="select_avatar">Выберите свой аватар</string>
 <string name="take_photo">Снять фото</string>
@@ -63,8 +49,6 @@
 <string name="photoPickerNotFoundText">Нельзя выбрать фото</string>
 
 	<!-- Settings class -->
-<string name="SettingsText">Имя пользователя</string>
-<string name="SettingsPassword">Пароль</string>
 <string name="SettingsProxy">Прокси</string>
 <string name="SettingsProxyProxy">Использовать прокси</string>
 <string name="SettingsProxySummary">Соединяться через прокси</string>
@@ -91,7 +75,6 @@
 <string name="CLP_hidden_contact">Скрывать оффлайн-контакты</string>
 <string name="CLP_hidden_contact_sum">Отметьте, чтобы спрятать контакты, которые не в сети</string>
 <string name="settings_account_username">Имя пользователя</string>
-<string name="login_username_info_default"/>
 <string name="settings_account_password">Пароль</string>
 <string name="settings_account_server">Сервер</string>
 <string name="settings_account_port">Порт</string>
@@ -125,8 +108,6 @@
 <string name="settings_chat_compact_sum">Сделать окно диалога компактным</string>
 <string name="history">История</string>
 <string name="history_sum">Пометьте для сохранения разговоров на SD карте</string>
-<string name="history_mount">Для сохранения истории необходима установленная SD карта с разрешённой записью</string>
-<string name="history_on_off">Разрешить сохранение истории</string>
 <string name="chat_preferences">Диалог</string>
 <string name="chat_preferences_sum">История, размер  диалога...</string>
 <string name="chat_history_path">Путь к истории</string>
@@ -142,9 +123,6 @@
 <string name="SubscriptText">%s желает добавить вас в свой контакт-лист. Авторизовать его(-е)?</string>
 <string name="SubscriptTitle">Авторизовать пользователя?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">Пришло новое сообщение</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">Beem: Соединение разорвано</string>
 
@@ -153,36 +131,19 @@
 <string name="AcceptContactRequestFrom">Авторизовать %s.</string>
 
 <!-- Activities -->
-<string name="login_tag"/>
 <string name="edit_settings_name">Настройки</string>
-<string name="edit_settings_tag"/>
 <string name="create_account_name">Создать аккаунт</string>
-<string name="create_account_tag"/>
 <string name="contact_list_name">Контакты</string>
-<string name="contact_list_tag"/>
 <string name="user_info_name">Информация о пользователе</string>
 
-<!-- Buttons -->
-<string name="button_create_account">Создать аккаунт</string>
-<string name="button_create_login_account">Создать аккаунт и подключиться</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">Имя пользователя</string>
-<string name="login_password">Пароль</string>
-<string name="login_error_dialog_title">Ошибка входа</string>
-<string name="login_close_dialog_button">Закрыть</string>
-<string name="login_menu_create_account">Создать аккаунт</string>
 <string name="login_menu_settings">Настройки</string>
 <string name="login_menu_about">О программе</string>
 <string name="login_about_title">Beem %s - О программе</string>
 <string name="login_about_msg"/>
 <string name="login_about_button">Закрыть</string>
-<string name="login_settings_button">Настройки</string>
-<string name="login_login_button">Войти</string>
 <string name="login_login_progress">Соединение. Пожалуйста, подождите...</string>
-<string name="login_error_msg">К сожалению, произошла ошибка.\n\nПодробности:\n%s</string>
 <string name="login_menu_login">Войти</string>
-<string name="login_no_connectivity">Интернет соединение не найдено</string>
 <string name="login_start_msg">Настройки в меню</string>
 
 <!-- LoginAnim activity -->
@@ -216,16 +177,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>Добро пожаловать в Beem.</b>\n\nВы ещё не настроили аккаунт XMPP (Jabber).\nВыберите один из следующих вариантов :</string>
-<string name="account_wizard_configure_text"/>
 <string name="account_wizard_configure_account">Использовать существующий аккаунт</string>
 <string name="account_wizard_create_account">Создать новый аккаунт</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">Создание учётной записи - Инструкция</string>
-<string name="create_account_err_dialog_title">Создание учётной записи - Ошибка</string>
-<string name="create_account_err_dialog_settings_button">Изменить мои настройки</string>
-<string name="create_account_close_dialog_button">Закрыть</string>
-<string name="create_account_successfull_after">Аккаунт %s успешно создан</string>
 <string name="create_account_err_username">Неправильный JID</string>
 <string name="create_account_err_passwords">Пароли не совпадают</string>
 <string name="create_account_username">Имя пользователя</string>
@@ -317,4 +272,4 @@
 <string name="undefined_condition"/>
 <string name="unexpected_condition"/>
 <string name="request_timeout"/>
-</resources>
\ No newline at end of file
+</resources>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rCN/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-zh-rCN/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">手动设置</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber账号 </string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">连接中...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">使用Beem服务</string>
-<string name="BeemServiceCreated">Beem服务已创建</string>
-<string name="BeemServiceDestroyed">Beem服务已取消</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">聊天</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">联系人已成功添加</string>
 <string name="AddCContactAddedError">联系人添加错误</string>
 <string name="AddCContactAddedLoginError">登录错误</string>
-<string name="AddCBadForm">格式错误</string>
 <string name="AddCContactAlready">联系人已存在</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">我的个人消息</string>
 <string name="OpenContactList">打开联系人列表</string>
 
-<string name="MenuAddContact">添加心联系人</string>
-<string name="MenuAccountAbout">Beem项目</string>
-<string name="MenuAccountCreate">创建账号</string>
-<string name="MenuConnection">编辑账号</string>
 <string name="ChangeStatusOk">更新状态</string>
-<string name="ChangeStatusNoChange">没有东西需要改变</string>
 <string name="my_avatar">我的头像</string>
 <string name="select_avatar">选择头像</string>
 <string name="take_photo">照相</string>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">修改用户名</string>
-<string name="SettingsPassword">修改密码</string>
 <string name="SettingsProxy">代理</string>
 <string name="SettingsProxyProxy">使用代理服务器</string>
 <string name="SettingsProxySummary">通过代理服务器登录</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">用户名</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">密码</string>
 <string name="settings_account_server">服务器</string>
 <string name="settings_account_port">端口</string>
@@ -128,8 +111,6 @@
 <string name="settings_chat_compact_sum">设定聊天协议</string>
 <string name="history">历史记录</string>
 <string name="history_sum">保存对话到SD卡</string>
-<string name="history_mount">你需要有已插入设备并可以写入的SD存储来允许历史记录</string>
-<string name="history_on_off">允许历史记录</string>
 <string name="chat_preferences">聊天</string>
 <string name="chat_preferences_sum"></string>
 <string name="chat_history_path">历史路径</string>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s 想要添加你到他/她的好友列表.批准他/她的请求吗?</string>
 <string name="SubscriptTitle">批准好友请求?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">你有一个新消息</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM:你的连接已断开</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">批准%s联系你</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - 登录中</string>
 <string name="edit_settings_name">Beem - 设置</string>
-<string name="edit_settings_tag">Beem - 编制设置</string>
 <string name="create_account_name">Beem - 创建新账号 </string>
-<string name="create_account_tag">Beem - 创建新账号中</string>
 <string name="contact_list_name">Beem - 联系人</string>
-<string name="contact_list_tag">Beem - 联系人列表</string>
 <string name="user_info_name">Beem - 用户信息</string>
 
-<!-- Buttons -->
-<string name="button_create_account">创建这个账户</string>
-<string name="button_create_login_account">创建并使用这个账户</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">用户名</string>
-<string name="login_password">密码</string>
-<string name="login_error_dialog_title">登录 - 错误</string>
-<string name="login_close_dialog_button">关闭</string>
-<string name="login_menu_create_account">创建一个账号</string>
 <string name="login_menu_settings">设置</string>
 <string name="login_menu_about">关于</string>
 <string name="login_about_title">Beem %s - 关于</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">关闭</string>
-<string name="login_settings_button">设置</string>
-<string name="login_login_button">登录</string>
 <string name="login_login_progress">连接中,请等待...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">登陆</string>
-<string name="login_no_connectivity">没有可用连接</string>
 <string name="login_start_msg">菜单设置配置</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>欢迎使用BEEM.</b>\n\n您还没有设定XMPP (Jabber)账户.请选择下面的选项。\n请选择下面的选项:</string>
-<string name="account_wizard_configure_text"><b>请输入您已有账号的信息</b></string>
 <string name="account_wizard_configure_account">我想使用我已有的账号</string>
 <string name="account_wizard_create_account">我想创建一个新账号</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">创建新账号 - 向导</string>
-<string name="create_account_err_dialog_title">创建新账号 - 错误</string>
-<string name="create_account_err_dialog_settings_button">修改设置</string>
-<string name="create_account_close_dialog_button">关闭</string>
-<string name="create_account_successfull_after">账号%s已成功创建</string>
 <string name="create_account_err_username">错误的Jabber ID</string>
 <string name="create_account_err_passwords">密码不匹配。</string>
 <string name="create_account_username">用户名</string>
diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-zh-rTW/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">手动设置</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber账号 </string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">连接中...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">使用Beem服务</string>
-<string name="BeemServiceCreated">Beem服务已创建</string>
-<string name="BeemServiceDestroyed">Beem服务已取消</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">聊天</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">联系人已成功添加</string>
 <string name="AddCContactAddedError">联系人添加错误</string>
 <string name="AddCContactAddedLoginError">登录错误</string>
-<string name="AddCBadForm">格式错误</string>
 <string name="AddCContactAlready">联系人已存在</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">我的个人消息</string>
 <string name="OpenContactList">打开联系人列表</string>
 
-<string name="MenuAddContact">添加心联系人</string>
-<string name="MenuAccountAbout">Beem项目</string>
-<string name="MenuAccountCreate">创建账号</string>
-<string name="MenuConnection">编辑账号</string>
 <string name="ChangeStatusOk">更新状态</string>
-<string name="ChangeStatusNoChange">没有东西需要改变</string>
 <string name="my_avatar">我的头像</string>
 <string name="select_avatar">选择头像</string>
 <string name="take_photo">照相</string>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">修改用户名</string>
-<string name="SettingsPassword">修改密码</string>
 <string name="SettingsProxy">代理</string>
 <string name="SettingsProxyProxy">使用代理服务器</string>
 <string name="SettingsProxySummary">通过代理服务器登录</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">用户名</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">密码</string>
 <string name="settings_account_server">服务器</string>
 <string name="settings_account_port">端口</string>
@@ -128,8 +111,6 @@
 <string name="settings_chat_compact_sum">设定聊天协议</string>
 <string name="history">历史记录</string>
 <string name="history_sum">保存对话到SD卡</string>
-<string name="history_mount">你需要有已插入设备并可以写入的SD存储来允许历史记录</string>
-<string name="history_on_off">允许历史记录</string>
 <string name="chat_preferences">聊天</string>
 <string name="chat_preferences_sum"></string>
 <string name="chat_history_path">历史路径</string>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s 想要添加你到他/她的好友列表.批准他/她的请求吗?</string>
 <string name="SubscriptTitle">批准好友请求?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">你有一个新消息</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM:你的连接已断开</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">批准%s联系你</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - 登录中</string>
 <string name="edit_settings_name">Beem - 设置</string>
-<string name="edit_settings_tag">Beem - 编制设置</string>
 <string name="create_account_name">Beem - 创建新账号 </string>
-<string name="create_account_tag">Beem - 创建新账号中</string>
 <string name="contact_list_name">Beem - 联系人</string>
-<string name="contact_list_tag">Beem - 联系人列表</string>
 <string name="user_info_name">Beem - 用户信息</string>
 
-<!-- Buttons -->
-<string name="button_create_account">创建这个账户</string>
-<string name="button_create_login_account">创建并使用这个账户</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">用户名</string>
-<string name="login_password">密码</string>
-<string name="login_error_dialog_title">登录 - 错误</string>
-<string name="login_close_dialog_button">关闭</string>
-<string name="login_menu_create_account">创建一个账号</string>
 <string name="login_menu_settings">设置</string>
 <string name="login_menu_about">关于</string>
 <string name="login_about_title">Beem %s - 关于</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">关闭</string>
-<string name="login_settings_button">设置</string>
-<string name="login_login_button">登录</string>
 <string name="login_login_progress">连接中,请等待...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">登陆</string>
-<string name="login_no_connectivity">没有可用连接</string>
 <string name="login_start_msg">菜单设置配置</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>欢迎使用BEEM.</b>\n\n您还没有设定XMPP (Jabber)账户.请选择下面的选项。\n请选择下面的选项:</string>
-<string name="account_wizard_configure_text"><b>请输入您已有账号的信息</b></string>
 <string name="account_wizard_configure_account">我想使用我已有的账号</string>
 <string name="account_wizard_create_account">我想创建一个新账号</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">创建新账号 - 向导</string>
-<string name="create_account_err_dialog_title">创建新账号 - 错误</string>
-<string name="create_account_err_dialog_settings_button">修改设置</string>
-<string name="create_account_close_dialog_button">关闭</string>
-<string name="create_account_successfull_after">账号%s已成功创建</string>
 <string name="create_account_err_username">错误的Jabber ID</string>
 <string name="create_account_err_passwords">密码不匹配。</string>
 <string name="create_account_username">用户名</string>