Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

236 files changed, 8203 insertions, 5711 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f3d58d57..e4e91d80 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
 
         <activity
             android:name=".ui.ConversationActivity"
-            android:label="@string/title_activity_conversations"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
@@ -107,7 +107,7 @@
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ShareWithActivity"
-            android:label="@string/title_activity_conversations" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index f403701c..81a68008 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -31,6 +31,34 @@ public final class Config {
 	public static final long MAM_MAX_CATCHUP =  MILLISECONDS_IN_DAY / 2;
 	public static final int MAM_MAX_MESSAGES = 500;
 
+	public static final String ENABLED_CIPHERS[] = {
+		"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+		"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA384",
+		"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA256",
+		"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+		"TLS_ECDHE_RSA_AES_128_SHA",
+		"TLS_ECDHE_RSA_AES_256_SHA",
+
+		"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+		"TLS_DHE_RSA_WITH_AES_128_GCM_SHA384",
+		"TLS_DHE_RSA_WITH_AES_256_GCM_SHA256",
+		"TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+
+		"TLS_DHE_RSA_WITH_CAMELLIA_256_SHA",
+
+		// Fallback.
+		"TLS_RSA_WITH_AES_128_GCM_SHA256",
+		"TLS_RSA_WITH_AES_128_GCM_SHA384",
+		"TLS_RSA_WITH_AES_256_GCM_SHA256",
+		"TLS_RSA_WITH_AES_256_GCM_SHA384",
+		"TLS_RSA_WITH_AES_128_CBC_SHA256",
+		"TLS_RSA_WITH_AES_128_CBC_SHA384",
+		"TLS_RSA_WITH_AES_256_CBC_SHA256",
+		"TLS_RSA_WITH_AES_256_CBC_SHA384",
+		"TLS_RSA_WITH_AES_128_CBC_SHA",
+		"TLS_RSA_WITH_AES_256_CBC_SHA",
+	};
+
 	private Config() {
 
 	}
diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
index 7f7b350c..d5c45465 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
@@ -33,6 +33,7 @@ import net.java.otr4j.crypto.OtrCryptoEngineImpl;
 import net.java.otr4j.crypto.OtrCryptoException;
 import net.java.otr4j.session.InstanceTag;
 import net.java.otr4j.session.SessionID;
+import net.java.otr4j.session.FragmenterInstructions;
 
 public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
 
@@ -269,4 +270,9 @@ public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
 		}
 	}
 
+	@Override
+	public FragmenterInstructions getFragmenterInstructions(SessionID sessionID) {
+		return null;
+	}
+
 }
diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 83d9b7b2..ad5a4132 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -19,6 +19,7 @@ import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.http.HttpConnectionManager;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.UiCallback;
 import android.app.PendingIntent;
@@ -56,9 +57,11 @@ public class PgpEngine {
 							if (message.getEncryption() == Message.ENCRYPTION_PGP) {
 								message.setBody(os.toString());
 								message.setEncryption(Message.ENCRYPTION_DECRYPTED);
-								if (message.trusted() && message.bodyContainsDownloadable()) {
-									mXmppConnectionService.getHttpConnectionManager()
-											.createNewConnection(message);
+								final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
+								if (message.trusted()
+										&& message.bodyContainsDownloadable()
+										&& manager.getAutoAcceptFileSize() > 0) {
+									manager.createNewConnection(message);
 								}
 								callback.success(message);
 							}
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 470bd290..036acf63 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -108,9 +108,9 @@ public class Conversation extends AbstractEntity implements Blockable {
 		}
 	}
 
-	public void findMessagesWithFiles(OnMessageFound onMessageFound) {
+	public void findMessagesWithFiles(final OnMessageFound onMessageFound) {
 		synchronized (this.messages) {
-			for (Message message : this.messages) {
+			for (final Message message : this.messages) {
 				if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE)
 						&& message.getEncryption() != Message.ENCRYPTION_PGP) {
 					onMessageFound.onMessageFound(message);
@@ -119,14 +119,14 @@ public class Conversation extends AbstractEntity implements Blockable {
 		}
 	}
 
-	public Message findMessageWithFileAndUuid(String uuid) {
+	public Message findMessageWithFileAndUuid(final String uuid) {
 		synchronized (this.messages) {
-			for (Message message : this.messages) {
-				if (message.getType() == Message.TYPE_IMAGE
+			for (final Message message : this.messages) {
+				if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE)
 						&& message.getEncryption() != Message.ENCRYPTION_PGP
 						&& message.getUuid().equals(uuid)) {
 					return message;
-						}
+				}
 			}
 		}
 		return null;
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index b5a1897d..8112f5de 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -36,17 +36,19 @@ public class Message extends AbstractEntity {
 	public static final int TYPE_STATUS = 3;
 	public static final int TYPE_PRIVATE = 4;
 
-	public static String CONVERSATION = "conversationUuid";
-	public static String COUNTERPART = "counterpart";
-	public static String TRUE_COUNTERPART = "trueCounterpart";
-	public static String BODY = "body";
-	public static String TIME_SENT = "timeSent";
-	public static String ENCRYPTION = "encryption";
-	public static String STATUS = "status";
-	public static String TYPE = "type";
-	public static String REMOTE_MSG_ID = "remoteMsgId";
-	public static String SERVER_MSG_ID = "serverMsgId";
-	public static String RELATIVE_FILE_PATH = "relativeFilePath";
+	public static final String CONVERSATION = "conversationUuid";
+	public static final String COUNTERPART = "counterpart";
+	public static final String TRUE_COUNTERPART = "trueCounterpart";
+	public static final String BODY = "body";
+	public static final String TIME_SENT = "timeSent";
+	public static final String ENCRYPTION = "encryption";
+	public static final String STATUS = "status";
+	public static final String TYPE = "type";
+	public static final String REMOTE_MSG_ID = "remoteMsgId";
+	public static final String SERVER_MSG_ID = "serverMsgId";
+	public static final String RELATIVE_FILE_PATH = "relativeFilePath";
+	public static final String ME_COMMAND = "/me ";
+
 	public boolean markable = false;
 	protected String conversationUuid;
 	protected Jid counterpart;
@@ -310,12 +312,17 @@ public class Message extends AbstractEntity {
 	public boolean equals(Message message) {
 		if (this.serverMsgId != null && message.getServerMsgId() != null) {
 			return this.serverMsgId.equals(message.getServerMsgId());
+		} else if (this.body == null || this.counterpart == null) {
+			return false;
+		} else if (message.getRemoteMsgId() != null) {
+			return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid))
+					&& this.counterpart.equals(message.getCounterpart())
+					&& this.body.equals(message.getBody());
 		} else {
-			return this.body != null
-				&& this.counterpart != null
-				&& ((this.remoteMsgId != null && this.remoteMsgId.equals(message.getRemoteMsgId()))
-						|| this.uuid.equals(message.getRemoteMsgId())) && this.body.equals(message.getBody())
-				&& this.counterpart.equals(message.getCounterpart());
+			return this.remoteMsgId == null
+					&& this.counterpart.equals(message.getCounterpart())
+					&& this.body.equals(message.getBody())
+					&& Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.PING_TIMEOUT * 500;
 		}
 	}
 
@@ -348,15 +355,34 @@ public class Message extends AbstractEntity {
 	}
 
 	public boolean mergeable(final Message message) {
-		return message != null && (message.getType() == Message.TYPE_TEXT && this.getDownloadable() == null && message.getDownloadable() == null && message.getEncryption() != Message.ENCRYPTION_PGP && this.getType() == message.getType() && this.getStatus() == message.getStatus() && this.getEncryption() == message.getEncryption() && this.getCounterpart() != null && this.getCounterpart().equals(message.getCounterpart()) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && !message.bodyContainsDownloadable() && !this.bodyContainsDownloadable());
+		return message != null &&
+			(message.getType() == Message.TYPE_TEXT &&
+			 this.getDownloadable() == null &&
+			 message.getDownloadable() == null &&
+			 message.getEncryption() != Message.ENCRYPTION_PGP &&
+			 this.getType() == message.getType() &&
+			 this.getStatus() == message.getStatus() &&
+			 this.getEncryption() == message.getEncryption() &&
+			 this.getCounterpart() != null &&
+			 this.getCounterpart().equals(message.getCounterpart()) &&
+			 (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
+			 !message.bodyContainsDownloadable() &&
+			 !this.bodyContainsDownloadable() &&
+			 !message.getBody().startsWith(ME_COMMAND) &&
+			 !this.getBody().startsWith(ME_COMMAND)
+			);
 	}
 
 	public String getMergedBody() {
-		Message next = this.next();
+		final Message next = this.next();
 		if (this.mergeable(next)) {
-			return body.trim() + '\n' + next.getMergedBody();
+			return getBody() + '\n' + next.getMergedBody();
 		}
-		return body.trim();
+		return getBody();
+	}
+
+	public boolean hasMeCommand() {
+		return getMergedBody().startsWith(ME_COMMAND);
 	}
 
 	public int getMergedStatus() {
@@ -395,7 +421,7 @@ public class Message extends AbstractEntity {
 			String[] pathParts = url.getPath().split("/");
 			String filename;
 			if (pathParts.length > 0) {
-				filename = pathParts[pathParts.length - 1];
+				filename = pathParts[pathParts.length - 1].toLowerCase();
 			} else {
 				return false;
 			}
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 97a63532..27821c65 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -4,15 +4,77 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
+
 import android.annotation.SuppressLint;
 
 @SuppressLint("DefaultLocale")
 public class MucOptions {
+
+	public enum Affiliation {
+		OWNER("owner", 4, R.string.owner),
+		ADMIN("admin", 3, R.string.admin),
+		MEMBER("member", 2, R.string.member),
+		OUTCAST("outcast", 0, R.string.outcast),
+		NONE("none", 1, R.string.no_affiliation);
+
+		private Affiliation(String string, int rank, int resId) {
+			this.string = string;
+			this.resId = resId;
+			this.rank = rank;
+		}
+
+		private String string;
+		private int resId;
+		private int rank;
+
+		public int getResId() {
+			return resId;
+		}
+
+		@Override
+		public String toString() {
+			return this.string;
+		}
+
+		public boolean outranks(Affiliation affiliation) {
+			return rank > affiliation.rank;
+		}
+
+		public boolean ranks(Affiliation affiliation) {
+			return rank >= affiliation.rank;
+		}
+	}
+
+	public enum Role {
+		MODERATOR("moderator", R.string.moderator),
+		VISITOR("visitor", R.string.visitor),
+		PARTICIPANT("participant", R.string.participant),
+		NONE("none", R.string.no_role);
+
+		private Role(String string, int resId) {
+			this.string = string;
+			this.resId = resId;
+		}
+
+		private String string;
+		private int resId;
+
+		public int getResId() {
+			return resId;
+		}
+
+		@Override
+		public String toString() {
+			return this.string;
+		}
+	}
+
 	public static final int ERROR_NO_ERROR = 0;
 	public static final int ERROR_NICK_IN_USE = 1;
 	public static final int ERROR_UNKNOWN = 2;
@@ -22,6 +84,7 @@ public class MucOptions {
 
 	public static final int KICKED_FROM_ROOM = 9;
 
+	public static final String STATUS_CODE_ROOM_CONFIG_CHANGED = "104";
 	public static final String STATUS_CODE_SELF_PRESENCE = "110";
 	public static final String STATUS_CODE_BANNED = "301";
 	public static final String STATUS_CODE_CHANGED_NICK = "303";
@@ -30,6 +93,7 @@ public class MucOptions {
 
 	private interface OnEventListener {
 		public void onSuccess();
+
 		public void onFailure();
 	}
 
@@ -42,18 +106,8 @@ public class MucOptions {
 	}
 
 	public class User {
-		public static final int ROLE_MODERATOR = 3;
-		public static final int ROLE_NONE = 0;
-		public static final int ROLE_PARTICIPANT = 2;
-		public static final int ROLE_VISITOR = 1;
-		public static final int AFFILIATION_ADMIN = 4;
-		public static final int AFFILIATION_OWNER = 3;
-		public static final int AFFILIATION_MEMBER = 2;
-		public static final int AFFILIATION_OUTCAST = 1;
-		public static final int AFFILIATION_NONE = 0;
-
-		private int role;
-		private int affiliation;
+		private Role role = Role.NONE;
+		private Affiliation affiliation = Affiliation.NONE;
 		private String name;
 		private Jid jid;
 		private long pgpKeyId = 0;
@@ -74,7 +128,7 @@ public class MucOptions {
 			return this.jid;
 		}
 
-		public int getRole() {
+		public Role getRole() {
 			return this.role;
 		}
 
@@ -82,35 +136,41 @@ public class MucOptions {
 			role = role.toLowerCase();
 			switch (role) {
 				case "moderator":
-					this.role = ROLE_MODERATOR;
+					this.role = Role.MODERATOR;
 					break;
 				case "participant":
-					this.role = ROLE_PARTICIPANT;
+					this.role = Role.PARTICIPANT;
 					break;
 				case "visitor":
-					this.role = ROLE_VISITOR;
+					this.role = Role.VISITOR;
 					break;
 				default:
-					this.role = ROLE_NONE;
+					this.role = Role.NONE;
 					break;
 			}
 		}
 
-		public int getAffiliation() {
+		public Affiliation getAffiliation() {
 			return this.affiliation;
 		}
 
 		public void setAffiliation(String affiliation) {
-			if (affiliation.equalsIgnoreCase("admin")) {
-				this.affiliation = AFFILIATION_ADMIN;
-			} else if (affiliation.equalsIgnoreCase("owner")) {
-				this.affiliation = AFFILIATION_OWNER;
-			} else if (affiliation.equalsIgnoreCase("member")) {
-				this.affiliation = AFFILIATION_MEMBER;
-			} else if (affiliation.equalsIgnoreCase("outcast")) {
-				this.affiliation = AFFILIATION_OUTCAST;
-			} else {
-				this.affiliation = AFFILIATION_NONE;
+			affiliation = affiliation.toLowerCase();
+			switch (affiliation) {
+				case "admin":
+					this.affiliation = Affiliation.ADMIN;
+					break;
+				case "owner":
+					this.affiliation = Affiliation.OWNER;
+					break;
+				case "member":
+					this.affiliation = Affiliation.MEMBER;
+					break;
+				case "outcast":
+					this.affiliation = Affiliation.OUTCAST;
+					break;
+				default:
+					this.affiliation = Affiliation.NONE;
 			}
 		}
 
@@ -129,6 +189,7 @@ public class MucOptions {
 
 	private Account account;
 	private List<User> users = new CopyOnWriteArrayList<>();
+	private List<String> features = new ArrayList<>();
 	private Conversation conversation;
 	private boolean isOnline = false;
 	private int error = ERROR_UNKNOWN;
@@ -144,6 +205,31 @@ public class MucOptions {
 		this.conversation = conversation;
 	}
 
+	public void updateFeatures(ArrayList<String> features) {
+		this.features.clear();
+		this.features.addAll(features);
+	}
+
+	public boolean hasFeature(String feature) {
+		return this.features.contains(feature);
+	}
+
+	public boolean canInvite() {
+		 return !membersOnly() || self.getAffiliation().ranks(Affiliation.ADMIN);
+	}
+
+	public boolean membersOnly() {
+		return hasFeature("muc_membersonly");
+	}
+
+	public boolean nonanonymous() {
+		return hasFeature("muc_nonanonymous");
+	}
+
+	public boolean persistent() {
+		return hasFeature("muc_persistent");
+	}
+
 	public void deleteUser(String name) {
 		for (int i = 0; i < users.size(); ++i) {
 			if (users.get(i).getName().equals(name)) {
@@ -168,7 +254,7 @@ public class MucOptions {
 		if (!from.isBareJid()) {
 			final String name = from.getResourcepart();
 			final String type = packet.getAttribute("type");
-			final Element x = packet.findChild("x","http://jabber.org/protocol/muc#user");
+			final Element x = packet.findChild("x", "http://jabber.org/protocol/muc#user");
 			final List<String> codes = getStatusCodes(x);
 			if (type == null) {
 				User user = new User();
@@ -204,7 +290,7 @@ public class MucOptions {
 									msg = "";
 								}
 								user.setPgpKeyId(pgp.fetchKeyId(account, msg,
-											signed.getContent()));
+										signed.getContent()));
 							}
 						}
 					}
@@ -259,12 +345,12 @@ public class MucOptions {
 	}
 
 	private List<String> getStatusCodes(Element x) {
-		List<String> codes = new ArrayList<String>();
+		List<String> codes = new ArrayList<>();
 		if (x != null) {
-			for(Element child : x.getChildren()) {
+			for (Element child : x.getChildren()) {
 				if (child.getName().equals("status")) {
 					String code = child.getAttribute("code");
-					if (code!=null) {
+					if (code != null) {
 						codes.add(code);
 					}
 				}
@@ -389,7 +475,7 @@ public class MucOptions {
 
 	public Jid createJoinJid(String nick) {
 		try {
-			return Jid.fromString(this.conversation.getJid().toBareJid().toString() + "/"+nick);
+			return Jid.fromString(this.conversation.getJid().toBareJid().toString() + "/" + nick);
 		} catch (final InvalidJidException e) {
 			return null;
 		}
diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java
index 1a81a419..ce058004 100644
--- a/src/main/java/eu/siacs/conversations/entities/Roster.java
+++ b/src/main/java/eu/siacs/conversations/entities/Roster.java
@@ -1,14 +1,14 @@
 package eu.siacs.conversations.entities;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 
 import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class Roster {
 	final Account account;
-	final ConcurrentHashMap<String, Contact> contacts = new ConcurrentHashMap<>();
+	final HashMap<String, Contact> contacts = new HashMap<>();
 	private String version = null;
 
 	public Roster(Account account) {
@@ -19,23 +19,27 @@ public class Roster {
 		if (jid == null) {
 			return null;
 		}
-		final Contact contact = contacts.get(jid.toBareJid().toString());
-		if (contact != null && contact.showInRoster()) {
-			return contact;
-		} else {
-			return null;
+		synchronized (this.contacts) {
+			Contact contact = contacts.get(jid.toBareJid().toString());
+			if (contact != null && contact.showInRoster()) {
+				return contact;
+			} else {
+				return null;
+			}
 		}
 	}
 
 	public Contact getContact(final Jid jid) {
-		final Jid bareJid = jid.toBareJid();
-		if (contacts.containsKey(bareJid.toString())) {
-			return contacts.get(bareJid.toString());
-		} else {
-			final Contact contact = new Contact(bareJid);
-			contact.setAccount(account);
-			contacts.put(bareJid.toString(), contact);
-			return contact;
+		synchronized (this.contacts) {
+			final Jid bareJid = jid.toBareJid();
+			if (contacts.containsKey(bareJid.toString())) {
+				return contacts.get(bareJid.toString());
+			} else {
+				Contact contact = new Contact(bareJid);
+				contact.setAccount(account);
+				contacts.put(bareJid.toString(), contact);
+				return contact;
+			}
 		}
 	}
 
@@ -46,13 +50,13 @@ public class Roster {
 	}
 
 	public void markAllAsNotInRoster() {
-		for (final Contact contact : getContacts()) {
+		for (Contact contact : getContacts()) {
 			contact.resetOption(Contact.Options.IN_ROSTER);
 		}
 	}
 
 	public void clearSystemAccounts() {
-		for (final Contact contact : getContacts()) {
+		for (Contact contact : getContacts()) {
 			contact.setPhotoUri(null);
 			contact.setSystemName(null);
 			contact.setSystemAccount(null);
@@ -60,13 +64,17 @@ public class Roster {
 	}
 
 	public List<Contact> getContacts() {
-		return new ArrayList<>(this.contacts.values());
+		synchronized (this.contacts) {
+			return new ArrayList<>(this.contacts.values());
+		}
 	}
 
 	public void initContact(final Contact contact) {
 		contact.setAccount(account);
 		contact.setOption(Contact.Options.IN_ROSTER);
-		contacts.put(contact.getJid().toBareJid().toString(), contact);
+		synchronized (this.contacts) {
+			contacts.put(contact.getJid().toBareJid().toString(), contact);
+		}
 	}
 
 	public void setVersion(String version) {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 870ee757..526e5b19 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -5,6 +5,7 @@ import android.util.Base64;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -14,16 +15,22 @@ import java.util.TimeZone;
 import eu.siacs.conversations.services.XmppConnectionService;
 
 public abstract class AbstractGenerator {
-	public final String[] FEATURES = {"urn:xmpp:jingle:1",
+	private final String[] FEATURES = {
+			"urn:xmpp:jingle:1",
 			"urn:xmpp:jingle:apps:file-transfer:3",
 			"urn:xmpp:jingle:transports:s5b:1",
-			"urn:xmpp:jingle:transports:ibb:1", "urn:xmpp:receipts",
-			"urn:xmpp:chat-markers:0", "http://jabber.org/protocol/muc",
-			"jabber:x:conference", "http://jabber.org/protocol/caps",
+			"urn:xmpp:jingle:transports:ibb:1",
+			"http://jabber.org/protocol/muc",
+			"jabber:x:conference",
+			"http://jabber.org/protocol/caps",
 			"http://jabber.org/protocol/disco#info",
 			"urn:xmpp:avatar:metadata+notify",
 			"urn:xmpp:ping"};
-	public final String IDENTITY_NAME = "Conversations 0.10";
+	private final String[] MESSAGE_CONFIRMATION_FEATURES = {
+			"urn:xmpp:chat-markers:0",
+			"urn:xmpp:receipts"
+	};
+	public final String IDENTITY_NAME = "Conversations 1.0";
 	public final String IDENTITY_TYPE = "phone";
 
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
@@ -43,9 +50,8 @@ public abstract class AbstractGenerator {
 		} catch (NoSuchAlgorithmException e) {
 			return null;
 		}
-		List<String> features = Arrays.asList(FEATURES);
-		Collections.sort(features);
-		for (String feature : features) {
+
+		for (String feature : getFeatures()) {
 			s.append(feature + "<");
 		}
 		byte[] sha1 = md.digest(s.toString().getBytes());
@@ -56,4 +62,14 @@ public abstract class AbstractGenerator {
 		DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
 		return DATE_FORMAT.format(time);
 	}
+
+	public List<String> getFeatures() {
+		ArrayList<String> features = new ArrayList<>();
+		features.addAll(Arrays.asList(FEATURES));
+		if (mXmppConnectionService.confirmMessages()) {
+			features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES));
+		}
+		Collections.sort(features);
+		return features;
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index f94dc5d7..161e6f89 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -1,10 +1,11 @@
 package eu.siacs.conversations.generator;
 
-import java.util.Arrays;
-import java.util.Collections;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.Xmlns;
@@ -21,7 +22,7 @@ public class IqGenerator extends AbstractGenerator {
 	}
 
 	public IqPacket discoResponse(final IqPacket request) {
-		final IqPacket packet = new IqPacket(IqPacket.TYPE_RESULT);
+		final IqPacket packet = new IqPacket(IqPacket.TYPE.RESULT);
 		packet.setId(request.getId());
 		packet.setTo(request.getFrom());
 		final Element query = packet.addChild("query",
@@ -31,16 +32,14 @@ public class IqGenerator extends AbstractGenerator {
 		identity.setAttribute("category", "client");
 		identity.setAttribute("type", this.IDENTITY_TYPE);
 		identity.setAttribute("name", IDENTITY_NAME);
-		final List<String> features = Arrays.asList(FEATURES);
-		Collections.sort(features);
-		for (final String feature : features) {
+		for (final String feature : getFeatures()) {
 			query.addChild("feature").setAttribute("var", feature);
 		}
 		return packet;
 	}
 
 	protected IqPacket publish(final String node, final Element item) {
-		final IqPacket packet = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
 		final Element pubsub = packet.addChild("pubsub",
 				"http://jabber.org/protocol/pubsub");
 		final Element publish = pubsub.addChild("publish");
@@ -50,7 +49,7 @@ public class IqGenerator extends AbstractGenerator {
 	}
 
 	protected IqPacket retrieve(String node, Element item) {
-		final IqPacket packet = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket packet = new IqPacket(IqPacket.TYPE.GET);
 		final Element pubsub = packet.addChild("pubsub",
 				"http://jabber.org/protocol/pubsub");
 		final Element items = pubsub.addChild("items");
@@ -100,12 +99,14 @@ public class IqGenerator extends AbstractGenerator {
 	}
 
 	public IqPacket queryMessageArchiveManagement(final MessageArchiveService.Query mam) {
-		final IqPacket packet = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
 		final Element query = packet.query("urn:xmpp:mam:0");
 		query.setAttribute("queryid",mam.getQueryId());
 		final Data data = new Data();
 		data.setFormType("urn:xmpp:mam:0");
-		if (mam.getWith()!=null) {
+		if (mam.muc()) {
+			packet.setTo(mam.getWith());
+		} else if (mam.getWith()!=null) {
 			data.put("with", mam.getWith().toString());
 		}
 		data.put("start",getTimestamp(mam.getStart()));
@@ -119,28 +120,28 @@ public class IqGenerator extends AbstractGenerator {
 		return packet;
 	}
 	public IqPacket generateGetBlockList() {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 		iq.addChild("blocklist", Xmlns.BLOCKING);
 
 		return iq;
 	}
 
 	public IqPacket generateSetBlockRequest(final Jid jid) {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		final Element block = iq.addChild("block", Xmlns.BLOCKING);
 		block.addChild("item").setAttribute("jid", jid.toBareJid().toString());
 		return iq;
 	}
 
 	public IqPacket generateSetUnblockRequest(final Jid jid) {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		final Element block = iq.addChild("unblock", Xmlns.BLOCKING);
 		block.addChild("item").setAttribute("jid", jid.toBareJid().toString());
 		return iq;
 	}
 
 	public IqPacket generateSetPassword(final Account account, final String newPassword) {
-		final IqPacket packet = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
 		packet.setTo(account.getServer());
 		final Element query = packet.addChild("query", Xmlns.REGISTER);
 		final Jid jid = account.getJid();
@@ -148,4 +149,33 @@ public class IqGenerator extends AbstractGenerator {
 		query.addChild("password").setContent(newPassword);
 		return packet;
 	}
+
+	public IqPacket changeAffiliation(Conversation conference, Jid jid, String affiliation) {
+		List<Jid> jids = new ArrayList<>();
+		jids.add(jid);
+		return changeAffiliation(conference,jids,affiliation);
+	}
+
+	public IqPacket changeAffiliation(Conversation conference, List<Jid> jids, String affiliation) {
+		IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
+		packet.setTo(conference.getJid().toBareJid());
+		packet.setFrom(conference.getAccount().getJid());
+		Element query = packet.query("http://jabber.org/protocol/muc#admin");
+		for(Jid jid : jids) {
+			Element item = query.addChild("item");
+			item.setAttribute("jid", jid.toString());
+			item.setAttribute("affiliation", affiliation);
+		}
+		return packet;
+	}
+
+	public IqPacket changeRole(Conversation conference, String nick, String role) {
+		IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
+		packet.setTo(conference.getJid().toBareJid());
+		packet.setFrom(conference.getAccount().getJid());
+		Element item = packet.query("http://jabber.org/protocol/muc#admin").addChild("item");
+		item.setAttribute("nick", nick);
+		item.setAttribute("role", role);
+		return packet;
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 8e99888b..2ee636b5 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -68,7 +68,7 @@ public class MessageGenerator extends AbstractGenerator {
 		packet.addChild("private", "urn:xmpp:carbons:2");
 		packet.addChild("no-copy", "urn:xmpp:hints");
 		try {
-			packet.setBody(otrSession.transformSending(message.getBody()));
+			packet.setBody(otrSession.transformSending(message.getBody())[0]);
 			return packet;
 		} catch (OtrException e) {
 			return null;
diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
index e3642f6b..1e896724 100644
--- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
@@ -49,7 +49,7 @@ public class PresenceGenerator extends AbstractGenerator {
 			Element cap = packet.addChild("c",
 					"http://jabber.org/protocol/caps");
 			cap.setAttribute("hash", "sha-1");
-			cap.setAttribute("node", "http://conversions.siacs.eu");
+			cap.setAttribute("node", "http://conversions.im");
 			cap.setAttribute("ver", capHash);
 		}
 		return packet;
diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnection.java b/src/main/java/eu/siacs/conversations/http/HttpConnection.java
index 5348e395..4bff5251 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpConnection.java
@@ -14,11 +14,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
 import eu.siacs.conversations.Config;
@@ -65,14 +67,22 @@ public class HttpConnection implements Downloadable {
 		this.message.setDownloadable(this);
 		try {
 			mUrl = new URL(message.getBody());
-			String path = mUrl.getPath();
-			if (path != null && (path.endsWith(".pgp") || path.endsWith(".gpg"))) {
+			String[] parts = mUrl.getPath().toLowerCase().split("\\.");
+			String lastPart = parts.length >= 1 ? parts[parts.length - 1] : null;
+			String secondToLast = parts.length >= 2 ? parts[parts.length -2] : null;
+			if ("pgp".equals(lastPart) || "gpg".equals(lastPart)) {
 				this.message.setEncryption(Message.ENCRYPTION_PGP);
 			} else if (message.getEncryption() != Message.ENCRYPTION_OTR) {
 				this.message.setEncryption(Message.ENCRYPTION_NONE);
 			}
-			this.file = mXmppConnectionService.getFileBackend().getFile(
-					message, false);
+			String extension;
+			if (Arrays.asList(VALID_CRYPTO_EXTENSIONS).contains(lastPart)) {
+				extension = secondToLast;
+			} else {
+				extension = lastPart;
+			}
+			message.setRelativeFilePath(message.getUuid()+"."+extension);
+			this.file = mXmppConnectionService.getFileBackend().getFile(message, false);
 			String reference = mUrl.getRef();
 			if (reference != null && reference.length() == 96) {
 				this.file.setKey(CryptoHelper.hexToBytes(reference));
@@ -81,7 +91,7 @@ public class HttpConnection implements Downloadable {
 			if (this.message.getEncryption() == Message.ENCRYPTION_OTR
 					&& this.file.getKey() == null) {
 				this.message.setEncryption(Message.ENCRYPTION_NONE);
-			}
+					}
 			checkFileSize(false);
 		} catch (MalformedURLException e) {
 			this.cancel();
@@ -115,33 +125,39 @@ public class HttpConnection implements Downloadable {
 		mXmppConnectionService.updateConversationUi();
 	}
 
-	private void setupTrustManager(HttpsURLConnection connection,
-								   boolean interactive) {
-		X509TrustManager trustManager;
-		HostnameVerifier hostnameVerifier;
+	private void setupTrustManager(final HttpsURLConnection connection,
+			final boolean interactive) {
+		final X509TrustManager trustManager;
+		final HostnameVerifier hostnameVerifier;
 		if (interactive) {
 			trustManager = mXmppConnectionService.getMemorizingTrustManager();
 			hostnameVerifier = mXmppConnectionService
-					.getMemorizingTrustManager().wrapHostnameVerifier(
-							new StrictHostnameVerifier());
+				.getMemorizingTrustManager().wrapHostnameVerifier(
+						new StrictHostnameVerifier());
 		} else {
 			trustManager = mXmppConnectionService.getMemorizingTrustManager()
-					.getNonInteractive();
+				.getNonInteractive();
 			hostnameVerifier = mXmppConnectionService
-					.getMemorizingTrustManager()
-					.wrapHostnameVerifierNonInteractive(
-							new StrictHostnameVerifier());
+				.getMemorizingTrustManager()
+				.wrapHostnameVerifierNonInteractive(
+						new StrictHostnameVerifier());
 		}
 		try {
-			SSLContext sc = SSLContext.getInstance("TLS");
+			final SSLContext sc = SSLContext.getInstance("TLS");
 			sc.init(null, new X509TrustManager[]{trustManager},
 					mXmppConnectionService.getRNG());
-			connection.setSSLSocketFactory(sc.getSocketFactory());
+
+			final SSLSocketFactory sf = sc.getSocketFactory();
+			final String[] cipherSuites = CryptoHelper.getSupportedCipherSuites(
+					sf.getSupportedCipherSuites());
+			if (cipherSuites.length > 0) {
+				sc.getDefaultSSLParameters().setCipherSuites(cipherSuites);
+
+			}
+
+			connection.setSSLSocketFactory(sf);
 			connection.setHostnameVerifier(hostnameVerifier);
-		} catch (KeyManagementException e) {
-			return;
-		} catch (NoSuchAlgorithmException e) {
-			return;
+		} catch (final KeyManagementException | NoSuchAlgorithmException ignored) {
 		}
 	}
 
@@ -179,24 +195,24 @@ public class HttpConnection implements Downloadable {
 		}
 
 		private long retrieveFileSize() throws IOException,
-				SSLHandshakeException {
-			changeStatus(STATUS_CHECKING);
-			HttpURLConnection connection = (HttpURLConnection) mUrl
-					.openConnection();
-			connection.setRequestMethod("HEAD");
-			if (connection instanceof HttpsURLConnection) {
-				setupTrustManager((HttpsURLConnection) connection, interactive);
-			}
-			connection.connect();
-			String contentLength = connection.getHeaderField("Content-Length");
-			if (contentLength == null) {
-				throw new IOException();
-			}
-			try {
-				return Long.parseLong(contentLength, 10);
-			} catch (NumberFormatException e) {
-				throw new IOException();
-			}
+						SSLHandshakeException {
+							changeStatus(STATUS_CHECKING);
+							HttpURLConnection connection = (HttpURLConnection) mUrl
+								.openConnection();
+							connection.setRequestMethod("HEAD");
+							if (connection instanceof HttpsURLConnection) {
+								setupTrustManager((HttpsURLConnection) connection, interactive);
+							}
+							connection.connect();
+							String contentLength = connection.getHeaderField("Content-Length");
+							if (contentLength == null) {
+								throw new IOException();
+							}
+							try {
+								return Long.parseLong(contentLength, 10);
+							} catch (NumberFormatException e) {
+								throw new IOException();
+							}
 		}
 
 	}
@@ -225,7 +241,7 @@ public class HttpConnection implements Downloadable {
 
 		private void download() throws SSLHandshakeException, IOException {
 			HttpURLConnection connection = (HttpURLConnection) mUrl
-					.openConnection();
+				.openConnection();
 			if (connection instanceof HttpsURLConnection) {
 				setupTrustManager((HttpsURLConnection) connection, interactive);
 			}
@@ -291,4 +307,4 @@ public class HttpConnection implements Downloadable {
 	public String getMimeType() {
 		return "";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index e84545fc..6430c296 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -71,24 +71,17 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 		return super.avatarData(items);
 	}
 
-	public static boolean fromServer(final Account account, final IqPacket packet) {
-		return packet.getFrom() == null
-				|| packet.getFrom().equals(account.getServer())
-				|| packet.getFrom().equals(account.getJid().toBareJid())
-				|| packet.getFrom().equals(account.getJid());
-	}
-
 	@Override
 	public void onIqPacketReceived(final Account account, final IqPacket packet) {
-		if (packet.hasChild("query", Xmlns.ROSTER) && fromServer(account, packet)) {
+		if (packet.hasChild("query", Xmlns.ROSTER) && packet.fromServer(account)) {
 			final Element query = packet.findChild("query");
 			// If this is in response to a query for the whole roster:
-			if (packet.getType() == IqPacket.TYPE_RESULT) {
+			if (packet.getType() == IqPacket.TYPE.RESULT) {
 				account.getRoster().markAllAsNotInRoster();
 			}
 			this.rosterItems(account, query);
 		} else if ((packet.hasChild("block", Xmlns.BLOCKING) || packet.hasChild("blocklist", Xmlns.BLOCKING)) &&
-				fromServer(account, packet)) {
+				packet.fromServer(account)) {
 			// Block list or block push.
 			Log.d(Config.LOGTAG, "Received blocklist update from server");
 			final Element blocklist = packet.findChild("blocklist", Xmlns.BLOCKING);
@@ -97,8 +90,9 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 				(block != null ? block.getChildren() : null);
 			// If this is a response to a blocklist query, clear the block list and replace with the new one.
 			// Otherwise, just update the existing blocklist.
-			if (packet.getType() == IqPacket.TYPE_RESULT) {
+			if (packet.getType() == IqPacket.TYPE.RESULT) {
 				account.clearBlocklist();
+				account.getXmppConnection().getFeatures().setBlockListRequested(true);
 			}
 			if (items != null) {
 				final Collection<Jid> jids = new ArrayList<>(items.size());
@@ -116,7 +110,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 			// Update the UI
 			mXmppConnectionService.updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
 		} else if (packet.hasChild("unblock", Xmlns.BLOCKING) &&
-				fromServer(account, packet) && packet.getType() == IqPacket.TYPE_SET) {
+				packet.fromServer(account) && packet.getType() == IqPacket.TYPE.SET) {
 			Log.d(Config.LOGTAG, "Received unblock update from server");
 			final Collection<Element> items = packet.findChild("unblock", Xmlns.BLOCKING).getChildren();
 			if (items.size() == 0) {
@@ -144,12 +138,12 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 				.discoResponse(packet);
 			account.getXmppConnection().sendIqPacket(response, null);
 		} else if (packet.hasChild("ping", "urn:xmpp:ping")) {
-			final IqPacket response = packet.generateResponse(IqPacket.TYPE_RESULT);
+			final IqPacket response = packet.generateResponse(IqPacket.TYPE.RESULT);
 			mXmppConnectionService.sendIqPacket(account, response, null);
 		} else {
-			if ((packet.getType() == IqPacket.TYPE_GET)
-					|| (packet.getType() == IqPacket.TYPE_SET)) {
-				final IqPacket response = packet.generateResponse(IqPacket.TYPE_ERROR);
+			if ((packet.getType() == IqPacket.TYPE.GET)
+					|| (packet.getType() == IqPacket.TYPE.SET)) {
+				final IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
 				final Element error = response.addChild("error");
 				error.setAttribute("type", "cancel");
 				error.addChild("feature-not-implemented",
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 44cda261..49efb004 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1,15 +1,14 @@
 package eu.siacs.conversations.parser;
 
-import android.util.Log;
-
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 
-import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.entities.MucOptions;
+import eu.siacs.conversations.http.HttpConnectionManager;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.CryptoHelper;
@@ -76,7 +75,7 @@ public class MessageParser extends AbstractParser implements
 		}
 		updateLastseen(packet, account, true);
 		String body = packet.getBody();
-		if (body.matches("^\\?OTRv\\d*\\?")) {
+		if (body.matches("^\\?OTRv\\d{1,2}\\?.*")) {
 			conversation.endOtrIfNeeded();
 		}
 		if (!conversation.hasValidOtrSession()) {
@@ -103,8 +102,10 @@ public class MessageParser extends AbstractParser implements
 			body = otrSession.transformReceiving(body);
 			SessionStatus after = otrSession.getSessionStatus();
 			if ((before != after) && (after == SessionStatus.ENCRYPTED)) {
+				conversation.setNextEncryption(Message.ENCRYPTION_OTR);
 				mXmppConnectionService.onOtrSessionEstablished(conversation);
 			} else if ((before != after) && (after == SessionStatus.FINISHED)) {
+				conversation.setNextEncryption(Message.ENCRYPTION_NONE);
 				conversation.resetOtrSession();
 				mXmppConnectionService.updateConversationUi();
 			}
@@ -142,17 +143,30 @@ public class MessageParser extends AbstractParser implements
 		Conversation conversation = mXmppConnectionService
 				.findOrCreateConversation(account, from.toBareJid(), true);
 		if (packet.hasChild("subject")) {
-			conversation.getMucOptions().setSubject(
-					packet.findChild("subject").getContent());
+			conversation.setHasMessagesLeftOnServer(true);
+			conversation.getMucOptions().setSubject(packet.findChild("subject").getContent());
 			mXmppConnectionService.updateConversationUi();
 			return null;
 		}
-		if (from.isBareJid()) {
+
+		final Element x = packet.findChild("x", "http://jabber.org/protocol/muc#user");
+		if (from.isBareJid() && (x == null || !x.hasChild("status"))) {
+			return null;
+		} else if (from.isBareJid() && x.hasChild("status")) {
+			for(Element child : x.getChildren()) {
+				if (child.getName().equals("status")) {
+					String code = child.getAttribute("code");
+					if (code.contains(MucOptions.STATUS_CODE_ROOM_CONFIG_CHANGED)) {
+						mXmppConnectionService.fetchConferenceConfiguration(conversation);
+					}
+				}
+			}
 			return null;
 		}
+
 		if (from.getResourcepart().equals(conversation.getMucOptions().getActualNick())) {
 			if (mXmppConnectionService.markMessage(conversation,
-					packet.getId(), Message.STATUS_SEND)) {
+					packet.getId(), Message.STATUS_SEND_RECEIVED)) {
 				return null;
 			} else if (packet.getId() == null) {
 				Message message = conversation.findSentMessageWithBody(packet.getBody());
@@ -245,6 +259,10 @@ public class MessageParser extends AbstractParser implements
 				return null;
 			}
 		}
+		if (message.hasChild("x","http://jabber.org/protocol/muc#user")
+				&& "chat".equals(message.getAttribute("type"))) {
+			return null;
+		}
 		Conversation conversation = mXmppConnectionService
 				.findOrCreateConversation(account, fullJid.toBareJid(), false);
 		String pgpBody = getPgpBody(message);
@@ -344,6 +362,17 @@ public class MessageParser extends AbstractParser implements
 
 	private void parseNonMessage(Element packet, Account account) {
 		final Jid from = packet.getAttributeAsJid("from");
+		Element invite = extractInvite(packet);
+		if (invite != null) {
+			Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, from, true);
+			if (!conversation.getMucOptions().online()) {
+				Element password = invite.findChild("password");
+				conversation.getMucOptions().setPassword(password == null ? null : password.getContent());
+				mXmppConnectionService.databaseBackend.updateConversation(conversation);
+				mXmppConnectionService.joinMuc(conversation);
+				mXmppConnectionService.updateConversationUi();
+			}
+		}
 		if (packet.hasChild("event", "http://jabber.org/protocol/pubsub#event")) {
 			Element event = packet.findChild("event",
 					"http://jabber.org/protocol/pubsub#event");
@@ -370,42 +399,18 @@ public class MessageParser extends AbstractParser implements
 			updateLastseen(packet, account, false);
 			mXmppConnectionService.markMessage(account, from.toBareJid(),
 					id, Message.STATUS_SEND_RECEIVED);
-		} else if (packet.hasChild("x", "http://jabber.org/protocol/muc#user")) {
-			Element x = packet.findChild("x",
-					"http://jabber.org/protocol/muc#user");
-			if (x.hasChild("invite")) {
-				Conversation conversation = mXmppConnectionService
-						.findOrCreateConversation(account,
-								packet.getAttributeAsJid("from"), true);
-				if (!conversation.getMucOptions().online()) {
-					if (x.hasChild("password")) {
-						Element password = x.findChild("password");
-						conversation.getMucOptions().setPassword(
-								password.getContent());
-						mXmppConnectionService.databaseBackend
-								.updateConversation(conversation);
-					}
-					mXmppConnectionService.joinMuc(conversation);
-					mXmppConnectionService.updateConversationUi();
-				}
-			}
-		} else if (packet.hasChild("x", "jabber:x:conference")) {
-			Element x = packet.findChild("x", "jabber:x:conference");
-            Jid jid = x.getAttributeAsJid("jid");
-            String password = x.getAttribute("password");
-			if (jid != null) {
-				Conversation conversation = mXmppConnectionService
-						.findOrCreateConversation(account, jid, true);
-				if (!conversation.getMucOptions().online()) {
-					if (password != null) {
-						conversation.getMucOptions().setPassword(password);
-						mXmppConnectionService.databaseBackend
-								.updateConversation(conversation);
-					}
-					mXmppConnectionService.joinMuc(conversation);
-					mXmppConnectionService.updateConversationUi();
-				}
-			}
+		}
+	}
+
+	private Element extractInvite(Element message) {
+		Element x = message.findChild("x","http://jabber.org/protocol/muc#user");
+		if (x == null) {
+			x = message.findChild("x","jabber:x:conference");
+		}
+		if (x != null && x.hasChild("invite")) {
+			return x;
+		} else {
+			return null;
 		}
 	}
 
@@ -482,7 +487,6 @@ public class MessageParser extends AbstractParser implements
 	public void onMessagePacketReceived(Account account, MessagePacket packet) {
 		Message message = null;
 		this.parseNick(packet, account);
-
 		if ((packet.getType() == MessagePacket.TYPE_CHAT || packet.getType() == MessagePacket.TYPE_NORMAL)) {
 			if ((packet.getBody() != null)
 					&& (packet.getBody().startsWith("?OTR"))) {
@@ -490,9 +494,7 @@ public class MessageParser extends AbstractParser implements
 				if (message != null) {
 					message.markUnread();
 				}
-			} else if (packet.hasChild("body")
-					&& !(packet.hasChild("x",
-					"http://jabber.org/protocol/muc#user"))) {
+			} else if (packet.hasChild("body") && extractInvite(packet) == null) {
 				message = this.parseChat(packet, account);
 				if (message != null) {
 					message.markUnread();
@@ -578,9 +580,9 @@ public class MessageParser extends AbstractParser implements
 				mXmppConnectionService.databaseBackend.createMessage(message);
 			}
 		}
-		if (message.trusted() && message.bodyContainsDownloadable()) {
-			this.mXmppConnectionService.getHttpConnectionManager()
-					.createNewConnection(message);
+		final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
+		if (message.trusted() && message.bodyContainsDownloadable() && manager.getAutoAcceptFileSize() > 0) {
+			manager.createNewConnection(message);
 		} else if (!message.isRead()) {
 			mXmppConnectionService.getNotificationService().push(message);
 		}
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index 5fa61491..3ae3356d 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -220,10 +220,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
 	public Conversation findConversation(final Account account, final Jid contactJid) {
 		SQLiteDatabase db = this.getReadableDatabase();
-		String[] selectionArgs = { account.getUuid(), contactJid.toBareJid().toString() + "%" };
+		String[] selectionArgs = { account.getUuid(),
+				contactJid.toBareJid().toString() + "/%",
+				contactJid.toBareJid().toString()
+				};
 		Cursor cursor = db.query(Conversation.TABLENAME, null,
-				Conversation.ACCOUNT + "=? AND " + Conversation.CONTACTJID
-						+ " like ?", selectionArgs, null, null, null);
+				Conversation.ACCOUNT + "=? AND (" + Conversation.CONTACTJID
+						+ " like ? OR "+Conversation.CONTACTJID+"=?)", selectionArgs, null, null, null);
 		if (cursor.getCount() == 0)
 			return null;
 		cursor.moveToFirst();
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index f7defcdf..62987aaa 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -57,28 +57,33 @@ public class FileBackend {
 
 	public DownloadableFile getFile(Message message, boolean decrypted) {
 		String path = message.getRelativeFilePath();
-		if (!decrypted && (message.getEncryption() == Message.ENCRYPTION_PGP || message.getEncryption() == Message.ENCRYPTION_DECRYPTED)) {
-			String extension;
-			if (path != null && !path.isEmpty()) {
-				String[] parts = path.split("\\.");
-				extension = "."+parts[parts.length - 1];
-			} else if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_TEXT) {
+		String extension;
+		if (path != null && !path.isEmpty()) {
+			String[] parts = path.split("\\.");
+			extension = "."+parts[parts.length - 1];
+		} else {
+			if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_TEXT) {
 				extension = ".webp";
 			} else {
 				extension = "";
 			}
+			path = message.getUuid()+extension;
+		}
+		final boolean encrypted = !decrypted
+				&& (message.getEncryption() == Message.ENCRYPTION_PGP
+				|| message.getEncryption() == Message.ENCRYPTION_DECRYPTED);
+		if (encrypted) {
 			return new DownloadableFile(getConversationsFileDirectory()+message.getUuid()+extension+".pgp");
-		} else if (path != null && !path.isEmpty()) {
+		} else {
 			if (path.startsWith("/")) {
 				return new DownloadableFile(path);
 			} else {
-				return new DownloadableFile(getConversationsFileDirectory()+path);
+				if (message.getType() == Message.TYPE_FILE) {
+					return new DownloadableFile(getConversationsFileDirectory() + path);
+				} else {
+					return new DownloadableFile(getConversationsImageDirectory()+path);
+				}
 			}
-		} else {
-			StringBuilder filename = new StringBuilder();
-			filename.append(getConversationsImageDirectory());
-			filename.append(message.getUuid()+".webp");
-			return new DownloadableFile(filename.toString());
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 3ac4462d..f28dc24e 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -212,7 +212,8 @@ public class AvatarService {
 		}
 		bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
-		final String letter = name.isEmpty() ? "X" : name.substring(0,1);
+		final String trimmedName = name.trim();
+		final String letter = trimmedName.isEmpty() ? "X" : trimmedName.substring(0,1);
 		final int color = UIHelper.getColorForName(name);
 		drawTile(canvas, letter, color, 0, 0, size, size);
 		mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 82111243..f97077c4 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -111,7 +111,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE_ERROR) {
+					if (packet.getType() == IqPacket.TYPE.ERROR) {
 						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
 						finalizeQuery(query);
 					}
@@ -225,7 +225,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		private int messageCount = 0;
 		private long start;
 		private long end;
-		private Jid with = null;
 		private String queryId;
 		private String reference = null;
 		private Account account;
@@ -237,7 +236,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		public Query(Conversation conversation, long start, long end) {
 			this(conversation.getAccount(), start, end);
 			this.conversation = conversation;
-			this.with = conversation.getJid().toBareJid();
 		}
 
 		public Query(Conversation conversation, long start, long end, PagingOrder order) {
@@ -256,7 +254,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			Query query = new Query(this.account,this.start,this.end);
 			query.reference = reference;
 			query.conversation = conversation;
-			query.with = with;
 			query.totalCount = totalCount;
 			query.callback = callback;
 			return query;
@@ -287,7 +284,11 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		}
 
 		public Jid getWith() {
-			return with;
+			return conversation == null ? null : conversation.getJid().toBareJid();
+		}
+
+		public boolean muc() {
+			return conversation != null && conversation.getMode() == Conversation.MODE_MULTI;
 		}
 
 		public long getStart() {
@@ -338,11 +339,15 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		@Override
 		public String toString() {
 			StringBuilder builder = new StringBuilder();
-			builder.append("with=");
-			if (this.with==null) {
-				builder.append("*");
+			if (this.muc()) {
+				builder.append("to="+this.getWith().toString());
 			} else {
-				builder.append(with.toString());
+				builder.append("with=");
+				if (this.getWith() == null) {
+					builder.append("*");
+				} else {
+					builder.append(getWith().toString());
+				}
 			}
 			builder.append(", start=");
 			builder.append(AbstractGenerator.getTimestamp(this.start));
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index a30cf2f1..2ea0904f 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -1,5 +1,6 @@
 package eu.siacs.conversations.services;
 
+import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -8,6 +9,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.os.Build;
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
@@ -18,9 +20,13 @@ import android.text.Html;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -30,16 +36,15 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Downloadable;
-import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.ui.ManageAccountActivity;
 import eu.siacs.conversations.ui.TimePreference;
+import eu.siacs.conversations.utils.UIHelper;
 
 public class NotificationService {
 
-	private XmppConnectionService mXmppConnectionService;
+	private final XmppConnectionService mXmppConnectionService;
 
 	private final LinkedHashMap<String, ArrayList<Message>> notifications = new LinkedHashMap<>();
 
@@ -51,7 +56,7 @@ public class NotificationService {
 	private boolean mIsInForeground;
 	private long mLastNotification;
 
-	public NotificationService(XmppConnectionService service) {
+	public NotificationService(final XmppConnectionService service) {
 		this.mXmppConnectionService = service;
 	}
 
@@ -65,6 +70,24 @@ public class NotificationService {
 				 );
 	}
 
+	public void notifyPebble(final Message message) {
+		final Intent i = new Intent("com.getpebble.action.SEND_NOTIFICATION");
+
+		final Conversation conversation = message.getConversation();
+		final JSONObject jsonData = new JSONObject(new HashMap<String, String>(2) {{
+			put("title", conversation.getName());
+			put("body", message.getBody());
+		}});
+		final String notificationData = new JSONArray().put(jsonData).toString();
+
+		i.putExtra("messageType", "PEBBLE_ALERT");
+		i.putExtra("sender", "Conversations"); /* XXX: Shouldn't be hardcoded, e.g., AbstractGenerator.APP_NAME); */
+		i.putExtra("notificationData", notificationData);
+
+		mXmppConnectionService.sendBroadcast(i);
+	}
+
+
 	public boolean notificationsEnabled() {
 		return mXmppConnectionService.getPreferences().getBoolean("show_notification", true);
 	}
@@ -88,18 +111,33 @@ public class NotificationService {
 		return mXmppConnectionService.getPreferences().getBoolean("always_notify_in_conference", false);
 	}
 
+	@SuppressLint("NewApi")
+	@SuppressWarnings("deprecation")
+	private boolean isInteractive() {
+		final PowerManager pm = (PowerManager) mXmppConnectionService
+			.getSystemService(Context.POWER_SERVICE);
+
+		final boolean isScreenOn;
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+			isScreenOn = pm.isScreenOn();
+		} else {
+			isScreenOn = pm.isInteractive();
+		}
+
+		return isScreenOn;
+	}
+
 	public void push(final Message message) {
 		if (!notify(message)) {
 			return;
 		}
-		final PowerManager pm = (PowerManager) mXmppConnectionService
-			.getSystemService(Context.POWER_SERVICE);
-		final boolean isScreenOn = pm.isScreenOn();
 
-		if (this.mIsInForeground && isScreenOn
-				&& this.mOpenConversation == message.getConversation()) {
+		final boolean isScreenOn = isInteractive();
+
+		if (this.mIsInForeground && isScreenOn && this.mOpenConversation == message.getConversation()) {
 			return;
-				}
+		}
+
 		synchronized (notifications) {
 			final String conversationUuid = message.getConversationUuid();
 			if (notifications.containsKey(conversationUuid)) {
@@ -110,11 +148,14 @@ public class NotificationService {
 				notifications.put(conversationUuid, mList);
 			}
 			final Account account = message.getConversation().getAccount();
-			updateNotification((!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn)
-					&& !account.inGracePeriod()
-					&& !this.inMiniGracePeriod(account));
+			final boolean doNotify = (!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn)
+				&& !account.inGracePeriod()
+				&& !this.inMiniGracePeriod(account);
+			updateNotification(doNotify);
+			if (doNotify) {
+				notifyPebble(message);
+			}
 		}
-
 	}
 
 	public void clear() {
@@ -131,6 +172,10 @@ public class NotificationService {
 		}
 	}
 
+	private void setNotificationColor(final Builder mBuilder) {
+		mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.primary));
+	}
+
 	private void updateNotification(final boolean notify) {
 		final NotificationManager notificationManager = (NotificationManager) mXmppConnectionService
 			.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -161,6 +206,10 @@ public class NotificationService {
 					mBuilder.setSound(Uri.parse(ringtone));
 				}
 			}
+			if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+				mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
+			}
+			setNotificationColor(mBuilder);
 			mBuilder.setSmallIcon(R.drawable.ic_notification);
 			mBuilder.setDeleteIntent(createDeleteIntent());
 			mBuilder.setLights(0xffffffff, 2000, 4000);
@@ -172,19 +221,19 @@ public class NotificationService {
 	private Builder buildMultipleConversation() {
 		final Builder mBuilder = new NotificationCompat.Builder(
 				mXmppConnectionService);
-		NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle();
+		final NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle();
 		style.setBigContentTitle(notifications.size()
 				+ " "
 				+ mXmppConnectionService
 				.getString(R.string.unread_conversations));
 		final StringBuilder names = new StringBuilder();
 		Conversation conversation = null;
-		for (ArrayList<Message> messages : notifications.values()) {
+		for (final ArrayList<Message> messages : notifications.values()) {
 			if (messages.size() > 0) {
 				conversation = messages.get(0).getConversation();
-				String name = conversation.getName();
+				final String name = conversation.getName();
 				style.addLine(Html.fromHtml("<b>" + name + "</b> "
-							+ getReadableBody(messages.get(0))));
+							+ UIHelper.getMessagePreview(mXmppConnectionService,messages.get(0)).first));
 				names.append(name);
 				names.append(", ");
 			}
@@ -199,8 +248,7 @@ public class NotificationService {
 		mBuilder.setContentText(names.toString());
 		mBuilder.setStyle(style);
 		if (conversation != null) {
-			mBuilder.setContentIntent(createContentIntent(conversation
-						.getUuid()));
+			mBuilder.setContentIntent(createContentIntent(conversation));
 		}
 		return mBuilder;
 	}
@@ -214,14 +262,22 @@ public class NotificationService {
 			mBuilder.setLargeIcon(mXmppConnectionService.getAvatarService()
 					.get(conversation, getPixel(64)));
 			mBuilder.setContentTitle(conversation.getName());
-			final Message message;
+			Message message;
 			if ((message = getImage(messages)) != null) {
 				modifyForImage(mBuilder, message, messages, notify);
 			} else {
 				modifyForTextOnly(mBuilder, messages, notify);
 			}
-			mBuilder.setContentIntent(createContentIntent(conversation
-						.getUuid()));
+			if ((message = getFirstDownloadableMessage(messages)) != null) {
+				mBuilder.addAction(
+						Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+								R.drawable.ic_file_download_white_24dp : R.drawable.ic_action_download,
+						mXmppConnectionService.getResources().getString(R.string.download_x_file,
+							UIHelper.getFileDescriptionString(mXmppConnectionService, message)),
+						createDownloadIntent(message)
+						);
+			}
+			mBuilder.setContentIntent(createContentIntent(conversation));
 		}
 		return mBuilder;
 	}
@@ -242,9 +298,11 @@ public class NotificationService {
 			bigPictureStyle.bigPicture(bitmap);
 			if (tmp.size() > 0) {
 				bigPictureStyle.setSummaryText(getMergedBodies(tmp));
-				builder.setContentText(getReadableBody(tmp.get(0)));
+				builder.setContentText(UIHelper.getMessagePreview(mXmppConnectionService,tmp.get(0)).first);
 			} else {
-				builder.setContentText(mXmppConnectionService.getString(R.string.image_file));
+				builder.setContentText(mXmppConnectionService.getString(
+						R.string.received_x_file,
+						UIHelper.getFileDescriptionString(mXmppConnectionService,message)));
 			}
 			builder.setStyle(bigPictureStyle);
 		} catch (final FileNotFoundException e) {
@@ -254,15 +312,14 @@ public class NotificationService {
 
 	private void modifyForTextOnly(final Builder builder,
 			final ArrayList<Message> messages, final boolean notify) {
-		builder.setStyle(new NotificationCompat.BigTextStyle()
-				.bigText(getMergedBodies(messages)));
-		builder.setContentText(getReadableBody(messages.get(0)));
+		builder.setStyle(new NotificationCompat.BigTextStyle().bigText(getMergedBodies(messages)));
+		builder.setContentText(UIHelper.getMessagePreview(mXmppConnectionService,messages.get(0)).first);
 		if (notify) {
-			builder.setTicker(getReadableBody(messages.get(messages.size() - 1)));
+			builder.setTicker(UIHelper.getMessagePreview(mXmppConnectionService,messages.get(messages.size() - 1)).first);
 		}
 	}
 
-	private Message getImage(final ArrayList<Message> messages) {
+	private Message getImage(final Iterable<Message> messages) {
 		for (final Message message : messages) {
 			if (message.getType() == Message.TYPE_IMAGE
 					&& message.getDownloadable() == null
@@ -273,10 +330,20 @@ public class NotificationService {
 		return null;
 	}
 
-	private String getMergedBodies(final ArrayList<Message> messages) {
+	private Message getFirstDownloadableMessage(final Iterable<Message> messages) {
+		for (final Message message : messages) {
+			if ((message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) &&
+					message.getDownloadable() != null) {
+				return message;
+			}
+		}
+		return null;
+	}
+
+	private CharSequence getMergedBodies(final ArrayList<Message> messages) {
 		final StringBuilder text = new StringBuilder();
 		for (int i = 0; i < messages.size(); ++i) {
-			text.append(getReadableBody(messages.get(i)));
+			text.append(UIHelper.getMessagePreview(mXmppConnectionService,messages.get(i)).first);
 			if (i != messages.size() - 1) {
 				text.append("\n");
 			}
@@ -284,52 +351,39 @@ public class NotificationService {
 		return text.toString();
 	}
 
-	private String getReadableBody(final Message message) {
-		if (message.getDownloadable() != null
-				&& (message.getDownloadable().getStatus() == Downloadable.STATUS_OFFER || message
-					.getDownloadable().getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE)) {
-			if (message.getType() == Message.TYPE_FILE) {
-				return mXmppConnectionService.getString(R.string.file_offered_for_download);
-			} else {
-				return mXmppConnectionService.getText(
-						R.string.image_offered_for_download).toString();
-			}
-		} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-			return mXmppConnectionService.getText(
-					R.string.encrypted_message_received).toString();
-		} else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
-			return mXmppConnectionService.getText(R.string.decryption_failed)
-				.toString();
-		} else if (message.getType() == Message.TYPE_FILE) {
-			DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
-			return mXmppConnectionService.getString(R.string.file,file.getMimeType());
-		} else if (message.getType() == Message.TYPE_IMAGE) {
-			return mXmppConnectionService.getText(R.string.image_file)
-				.toString();
-		} else {
-			return message.getBody().trim();
-		}
-	}
-
-	private PendingIntent createContentIntent(final String conversationUuid) {
+	private PendingIntent createContentIntent(final String conversationUuid, final String downloadMessageUuid) {
 		final TaskStackBuilder stackBuilder = TaskStackBuilder
 			.create(mXmppConnectionService);
 		stackBuilder.addParentStack(ConversationActivity.class);
 
 		final Intent viewConversationIntent = new Intent(mXmppConnectionService,
 				ConversationActivity.class);
-		viewConversationIntent.setAction(Intent.ACTION_VIEW);
+		if (downloadMessageUuid != null) {
+			viewConversationIntent.setAction(ConversationActivity.ACTION_DOWNLOAD);
+		} else {
+			viewConversationIntent.setAction(Intent.ACTION_VIEW);
+		}
 		if (conversationUuid != null) {
-			viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
-					conversationUuid);
+			viewConversationIntent.putExtra(ConversationActivity.CONVERSATION, conversationUuid);
 			viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION);
 		}
+		if (downloadMessageUuid != null) {
+			viewConversationIntent.putExtra(ConversationActivity.MESSAGE, downloadMessageUuid);
+		}
 
 		stackBuilder.addNextIntent(viewConversationIntent);
 
 		return stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
 	}
 
+	private PendingIntent createDownloadIntent(final Message message) {
+		return createContentIntent(message.getConversationUuid(), message.getUuid());
+	}
+
+	private PendingIntent createContentIntent(final Conversation conversation) {
+		return createContentIntent(conversation.getUuid(), null);
+	}
+
 	private PendingIntent createDeleteIntent() {
 		final Intent intent = new Intent(mXmppConnectionService,
 				XmppConnectionService.class);
@@ -393,15 +447,32 @@ public class NotificationService {
 
 	public Notification createForegroundNotification() {
 		final NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService);
-		mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+
 		mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
-		mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_disable));
-		mBuilder.setContentIntent(createDisableForeground());
+		mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations));
+		mBuilder.setContentIntent(createOpenConversationsIntent());
 		mBuilder.setWhen(0);
 		mBuilder.setPriority(NotificationCompat.PRIORITY_MIN);
+		final int cancelIcon;
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			mBuilder.setCategory(Notification.CATEGORY_SERVICE);
+			mBuilder.setSmallIcon(R.drawable.ic_import_export_white_48dp);
+			cancelIcon = R.drawable.ic_cancel_white_24dp;
+		} else {
+			mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+			cancelIcon = R.drawable.ic_action_cancel;
+		}
+		mBuilder.addAction(cancelIcon,
+				mXmppConnectionService.getString(R.string.disable_foreground_service),
+				createDisableForeground());
+		setNotificationColor(mBuilder);
 		return mBuilder.build();
 	}
 
+	private PendingIntent createOpenConversationsIntent() {
+		return PendingIntent.getActivity(mXmppConnectionService, 0, new Intent(mXmppConnectionService,ConversationActivity.class),0);
+	}
+
 	public void updateErrorNotification() {
 		final NotificationManager mNotificationManager = (NotificationManager) mXmppConnectionService.getSystemService(Context.NOTIFICATION_SERVICE);
 		final List<Account> errors = new ArrayList<>();
@@ -422,9 +493,13 @@ public class NotificationService {
 			mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_fix));
 		}
 		mBuilder.setOngoing(true);
-		mBuilder.setLights(0xffffffff, 2000, 4000);
-		mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
-		TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService);
+		//mBuilder.setLights(0xffffffff, 2000, 4000);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			mBuilder.setSmallIcon(R.drawable.ic_warning_white_36dp);
+		} else {
+			mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+		}
+		final TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService);
 		stackBuilder.addParentStack(ConversationActivity.class);
 
 		final Intent manageAccountsIntent = new Intent(mXmppConnectionService,ManageAccountActivity.class);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 6bdc55a1..e34f9bd7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -84,7 +84,6 @@ import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
 import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
 import eu.siacs.conversations.xmpp.OnStatusChanged;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.PacketReceived;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.forms.Data;
 import eu.siacs.conversations.xmpp.forms.Field;
@@ -101,9 +100,8 @@ import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
 public class XmppConnectionService extends Service implements OnPhoneContactsLoadedListener {
 
 	public static final String ACTION_CLEAR_NOTIFICATION = "clear_notification";
-	private static final String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts";
 	public static final String ACTION_DISABLE_FOREGROUND = "disable_foreground";
-
+	private static final String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts";
 	private ContentObserver contactObserver = new ContentObserver(null) {
 		@Override
 		public void onChange(boolean selfChange) {
@@ -115,6 +113,56 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	};
 	private final IBinder mBinder = new XmppConnectionBinder();
+	private final List<Conversation> conversations = new CopyOnWriteArrayList<>();
+	private final FileObserver fileObserver = new FileObserver(
+			FileBackend.getConversationsImageDirectory()) {
+
+		@Override
+		public void onEvent(int event, String path) {
+			if (event == FileObserver.DELETE) {
+				markFileDeleted(path.split("\\.")[0]);
+			}
+		}
+	};
+	private final OnJinglePacketReceived jingleListener = new OnJinglePacketReceived() {
+
+		@Override
+		public void onJinglePacketReceived(Account account, JinglePacket packet) {
+			mJingleConnectionManager.deliverPacket(account, packet);
+		}
+	};
+	private final OnBindListener mOnBindListener = new OnBindListener() {
+
+		@Override
+		public void onBind(final Account account) {
+			account.getRoster().clearPresences();
+			account.pendingConferenceJoins.clear();
+			account.pendingConferenceLeaves.clear();
+			fetchRosterFromServer(account);
+			fetchBookmarks(account);
+			sendPresence(account);
+			connectMultiModeConversations(account);
+			updateConversationUi();
+		}
+	};
+	private final OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() {
+
+		@Override
+		public void onMessageAcknowledged(Account account, String uuid) {
+			for (final Conversation conversation : getConversations()) {
+				if (conversation.getAccount() == account) {
+					Message message = conversation.findUnsentMessageWithUuid(uuid);
+					if (message != null) {
+						markMessage(message, Message.STATUS_SEND);
+						if (conversation.setLastMessageTransmitted(System.currentTimeMillis())) {
+							databaseBackend.updateConversation(conversation);
+						}
+					}
+				}
+			}
+		}
+	};
+	private final IqGenerator mIqGenerator = new IqGenerator(this);
 	public DatabaseBackend databaseBackend;
 	public OnContactStatusChanged onContactStatusChanged = new OnContactStatusChanged() {
 
@@ -143,7 +191,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private MessageGenerator mMessageGenerator = new MessageGenerator(this);
 	private PresenceGenerator mPresenceGenerator = new PresenceGenerator(this);
 	private List<Account> accounts;
-	private final List<Conversation> conversations = new CopyOnWriteArrayList<>();
 	private JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager(
 			this);
 	private HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(
@@ -189,12 +236,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 				}
 				syncDirtyContacts(account);
-				scheduleWakeupCall(Config.PING_MAX_INTERVAL, true);
+				scheduleWakeUpCall(Config.PING_MAX_INTERVAL,account.getUuid().hashCode());
 			} else if (account.getStatus() == Account.State.OFFLINE) {
 				resetSendingToWaiting(account);
 				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 					int timeToReconnect = mRandom.nextInt(50) + 10;
-					scheduleWakeupCall(timeToReconnect, false);
+					scheduleWakeUpCall(timeToReconnect,account.getUuid().hashCode());
 				}
 			} else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
 				databaseBackend.updateAccount(account);
@@ -207,13 +254,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							+ ": error connecting account. try again in "
 							+ next + "s for the "
 							+ (connection.getAttempt() + 1) + " time");
-					scheduleWakeupCall((int) (next * 1.2), false);
+					scheduleWakeUpCall(next,account.getUuid().hashCode());
 				}
 					}
 			getNotificationService().updateErrorNotification();
 		}
 	};
-
 	private int accountChangedListenerCount = 0;
 	private OnRosterUpdate mOnRosterUpdate = null;
 	private OnUpdateBlocklist mOnUpdateBlocklist = null;
@@ -222,64 +268,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private OnMucRosterUpdate mOnMucRosterUpdate = null;
 	private int mucRosterChangedListenerCount = 0;
 	private SecureRandom mRandom;
-	private final FileObserver fileObserver = new FileObserver(
-			FileBackend.getConversationsImageDirectory()) {
-
-		@Override
-		public void onEvent(int event, String path) {
-			if (event == FileObserver.DELETE) {
-				markFileDeleted(path.split("\\.")[0]);
-			}
-		}
-	};
-	private final OnJinglePacketReceived jingleListener = new OnJinglePacketReceived() {
-
-		@Override
-		public void onJinglePacketReceived(Account account, JinglePacket packet) {
-			mJingleConnectionManager.deliverPacket(account, packet);
-		}
-	};
-
 	private OpenPgpServiceConnection pgpServiceConnection;
 	private PgpEngine mPgpEngine = null;
-	private Intent pingIntent;
-	private PendingIntent pendingPingIntent = null;
 	private WakeLock wakeLock;
 	private PowerManager pm;
-	private final OnBindListener mOnBindListener = new OnBindListener() {
-
-		@Override
-		public void onBind(final Account account) {
-			account.getRoster().clearPresences();
-			account.pendingConferenceJoins.clear();
-			account.pendingConferenceLeaves.clear();
-			fetchRosterFromServer(account);
-			fetchBookmarks(account);
-			sendPresencePacket(account,mPresenceGenerator.sendPresence(account));
-			connectMultiModeConversations(account);
-			updateConversationUi();
-		}
-	};
-
-	private final OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() {
-
-		@Override
-		public void onMessageAcknowledged(Account account, String uuid) {
-			for (final Conversation conversation : getConversations()) {
-				if (conversation.getAccount() == account) {
-					Message message = conversation.findUnsentMessageWithUuid(uuid);
-					if (message != null) {
-						markMessage(message, Message.STATUS_SEND);
-						if (conversation.setLastMessageTransmitted(System.currentTimeMillis())) {
-							databaseBackend.updateConversation(conversation);
-						}
-					}
-				}
-			}
-		}
-	};
 	private LruCache<String, Bitmap> mBitmapCache;
-	private final IqGenerator mIqGenerator = new IqGenerator(this);
 	private Thread mPhoneContactMergerThread;
 
 	public PgpEngine getPgpEngine() {
@@ -389,18 +382,22 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
-		if (intent != null && intent.getAction() != null) {
-			if (intent.getAction().equals(ACTION_MERGE_PHONE_CONTACTS)) {
-				PhoneHelper.loadPhoneContacts(getApplicationContext(), new ArrayList<Bundle>(), this);
-				return START_STICKY;
-			} else if (intent.getAction().equals(Intent.ACTION_SHUTDOWN)) {
-				logoutAndSave();
-				return START_NOT_STICKY;
-			} else if (intent.getAction().equals(ACTION_CLEAR_NOTIFICATION)) {
-				mNotificationService.clear();
-			} else if (intent.getAction().equals(ACTION_DISABLE_FOREGROUND)) {
-				getPreferences().edit().putBoolean("keep_foreground_service",false).commit();
-				toggleForegroundService();
+		final String action = intent == null ? null : intent.getAction();
+		if (action != null) {
+			switch (action) {
+				case ACTION_MERGE_PHONE_CONTACTS:
+					PhoneHelper.loadPhoneContacts(getApplicationContext(), new CopyOnWriteArrayList<Bundle>(), this);
+					return START_STICKY;
+				case Intent.ACTION_SHUTDOWN:
+					logoutAndSave();
+					return START_NOT_STICKY;
+				case ACTION_CLEAR_NOTIFICATION:
+					mNotificationService.clear();
+					break;
+				case ACTION_DISABLE_FOREGROUND:
+					getPreferences().edit().putBoolean("keep_foreground_service",false).commit();
+					toggleForegroundService();
+					break;
 			}
 		}
 		this.wakeLock.acquire();
@@ -420,37 +417,39 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						}
 					}
 					if (account.getStatus() == Account.State.ONLINE) {
-						long lastReceived = account.getXmppConnection()
-							.getLastPacketReceived();
-						long lastSent = account.getXmppConnection()
-							.getLastPingSent();
-						if (lastSent - lastReceived >= Config.PING_TIMEOUT * 1000) {
-							Log.d(Config.LOGTAG, account.getJid()
-									+ ": ping timeout");
+						long lastReceived = account.getXmppConnection().getLastPacketReceived();
+						long lastSent = account.getXmppConnection().getLastPingSent();
+						long pingInterval = "ui".equals(action) ? Config.PING_MIN_INTERVAL * 1000 : Config.PING_MAX_INTERVAL * 1000;
+						long msToNextPing = (Math.max(lastReceived,lastSent) + pingInterval) - SystemClock.elapsedRealtime();
+						if (lastSent > lastReceived && (lastSent +  Config.PING_TIMEOUT * 1000) < SystemClock.elapsedRealtime()) {
+							Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": ping timeout");
 							this.reconnectAccount(account, true);
-						} else if (SystemClock.elapsedRealtime() - lastReceived >= Config.PING_MIN_INTERVAL * 1000) {
+						} else if (msToNextPing <= 0) {
 							account.getXmppConnection().sendPing();
-							this.scheduleWakeupCall(2, false);
+							Log.d(Config.LOGTAG, account.getJid().toBareJid()+" send ping");
+							this.scheduleWakeUpCall(Config.PING_TIMEOUT,account.getUuid().hashCode());
+						} else {
+							this.scheduleWakeUpCall((int) (msToNextPing / 1000), account.getUuid().hashCode());
 						}
 					} else if (account.getStatus() == Account.State.OFFLINE) {
 						if (account.getXmppConnection() == null) {
-							account.setXmppConnection(this
-									.createConnection(account));
+							account.setXmppConnection(this.createConnection(account));
 						}
 						new Thread(account.getXmppConnection()).start();
-					} else if ((account.getStatus() == Account.State.CONNECTING)
-							&& ((SystemClock.elapsedRealtime() - account
-									.getXmppConnection().getLastConnect()) / 1000 >= Config.CONNECT_TIMEOUT)) {
-						Log.d(Config.LOGTAG, account.getJid()
-								+ ": time out during connect reconnecting");
-						reconnectAccount(account, true);
+					} else if (account.getStatus() == Account.State.CONNECTING) {
+						long timeout = Config.CONNECT_TIMEOUT - ((SystemClock.elapsedRealtime() - account.getXmppConnection().getLastConnect()) / 1000);
+						if (timeout < 0) {
+							Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting");
+							reconnectAccount(account, true);
+						} else {
+							scheduleWakeUpCall((int) timeout,account.getUuid().hashCode());
+						}
 					} else {
 						if (account.getXmppConnection().getTimeToNextAttempt() <= 0) {
 							reconnectAccount(account, true);
 						}
 					}
-					// in any case. reschedule wakup call
-					this.scheduleWakeupCall(Config.PING_MAX_INTERVAL, true);
+
 				}
 				if (mOnAccountUpdate != null) {
 					mOnAccountUpdate.onAccountUpdate();
@@ -503,7 +502,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			this.databaseBackend.readRoster(account.getRoster());
 		}
 		initConversations();
-		PhoneHelper.loadPhoneContacts(getApplicationContext(),new ArrayList<Bundle>(), this);
+		PhoneHelper.loadPhoneContacts(getApplicationContext(),new CopyOnWriteArrayList<Bundle>(), this);
 
 		getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
 		this.fileObserver.startWatching();
@@ -547,42 +546,16 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		stopSelf();
 	}
 
-	protected void scheduleWakeupCall(int seconds, boolean ping) {
-		long timeToWake = SystemClock.elapsedRealtime() + seconds * 1000;
-		Context context = getApplicationContext();
-		AlarmManager alarmManager = (AlarmManager) context
-			.getSystemService(Context.ALARM_SERVICE);
+	protected void scheduleWakeUpCall(int seconds, int requestCode) {
+		final long timeToWake = SystemClock.elapsedRealtime() + (seconds + 1) * 1000;
 
-		if (ping) {
-			if (this.pingIntent == null) {
-				this.pingIntent = new Intent(context, EventReceiver.class);
-				this.pingIntent.setAction("ping");
-				this.pingIntent.putExtra("time", timeToWake);
-				this.pendingPingIntent = PendingIntent.getBroadcast(context, 0,
-						this.pingIntent, 0);
-				alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
-						timeToWake, pendingPingIntent);
-			} else {
-				long scheduledTime = this.pingIntent.getLongExtra("time", 0);
-				if (scheduledTime < SystemClock.elapsedRealtime()
-						|| (scheduledTime > timeToWake)) {
-					this.pingIntent.putExtra("time", timeToWake);
-					alarmManager.cancel(this.pendingPingIntent);
-					this.pendingPingIntent = PendingIntent.getBroadcast(
-							context, 0, this.pingIntent, 0);
-					alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
-							timeToWake, pendingPingIntent);
-						}
-			}
-		} else {
-			Intent intent = new Intent(context, EventReceiver.class);
-			intent.setAction("ping_check");
-			PendingIntent alarmIntent = PendingIntent.getBroadcast(context, 0,
-					intent, 0);
-			alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake,
-					alarmIntent);
-		}
+		Context context = getApplicationContext();
+		AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
+		Intent intent = new Intent(context, EventReceiver.class);
+		intent.setAction("ping");
+		PendingIntent alarmIntent = PendingIntent.getBroadcast(context, requestCode, intent, 0);
+		alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, alarmIntent);
 	}
 
 	public XmppConnection createConnection(final Account account) {
@@ -787,7 +760,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void fetchRosterFromServer(final Account account) {
-		final IqPacket iqPacket = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket iqPacket = new IqPacket(IqPacket.TYPE.GET);
 		if (!"".equals(account.getRosterVersion())) {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid()
 					+ ": fetching roster version " + account.getRosterVersion());
@@ -800,10 +773,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void fetchBookmarks(final Account account) {
-		final IqPacket iqPacket = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket iqPacket = new IqPacket(IqPacket.TYPE.GET);
 		final Element query = iqPacket.query("jabber:iq:private");
 		query.addChild("storage", "storage:bookmarks");
-		final PacketReceived callback = new OnIqPacketReceived() {
+		final OnIqPacketReceived callback = new OnIqPacketReceived() {
 
 			@Override
 			public void onIqPacketReceived(final Account account, final IqPacket packet) {
@@ -835,7 +808,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void pushBookmarks(Account account) {
-		IqPacket iqPacket = new IqPacket(IqPacket.TYPE_SET);
+		IqPacket iqPacket = new IqPacket(IqPacket.TYPE.SET);
 		Element query = iqPacket.query("jabber:iq:private");
 		Element storage = query.addChild("storage", "storage:bookmarks");
 		for (Bookmark bookmark : account.getBookmarks()) {
@@ -970,6 +943,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				List<Message> messages = databaseBackend.getMessages(conversation, 50,timestamp);
 				if (messages.size() > 0) {
 					conversation.addAll(0, messages);
+					checkDeletedFiles(conversation);
 					callback.onMoreMessagesLoaded(messages.size(), conversation);
 				} else if (conversation.hasMessagesLeftOnServer()
 						&& account.isOnlineAndConnected()
@@ -984,11 +958,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}).start();
 	}
 
-	public interface OnMoreMessagesLoaded {
-		public void onMoreMessagesLoaded(int count,Conversation conversation);
-		public void informUser(int r);
-	}
-
 	public List<Account> getAccounts() {
 		return this.accounts;
 	}
@@ -1003,23 +972,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public Conversation find(final Iterable<Conversation> haystack, final Account account, final Jid jid) {
-		if (jid == null ) {
+		if (jid == null) {
 			return null;
 		}
 		for (final Conversation conversation : haystack) {
 			if ((account == null || conversation.getAccount() == account)
 					&& (conversation.getJid().toBareJid().equals(jid.toBareJid()))) {
 				return conversation;
-					}
+			}
 		}
 		return null;
 	}
 
-	public Conversation findOrCreateConversation(final Account account, final Jid jid,final boolean muc) {
-		return this.findOrCreateConversation(account,jid,muc,null);
+	public Conversation findOrCreateConversation(final Account account, final Jid jid, final boolean muc) {
+		return this.findOrCreateConversation(account, jid, muc, null);
 	}
 
-	public Conversation findOrCreateConversation(final Account account, final Jid jid,final boolean muc, final MessageArchiveService.Query query) {
+	public Conversation findOrCreateConversation(final Account account, final Jid jid, final boolean muc, final MessageArchiveService.Query query) {
 		synchronized (this.conversations) {
 			Conversation conversation = find(account, jid);
 			if (conversation != null) {
@@ -1031,9 +1000,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				conversation.setAccount(account);
 				if (muc) {
 					conversation.setMode(Conversation.MODE_MULTI);
+					conversation.setContactJid(jid);
 				} else {
 					conversation.setMode(Conversation.MODE_SINGLE);
+					conversation.setContactJid(jid.toBareJid());
 				}
+				conversation.setNextEncryption(-1);
 				conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE));
 				this.databaseBackend.updateConversation(conversation);
 			} else {
@@ -1048,18 +1020,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					conversation = new Conversation(conversationName, account, jid,
 							Conversation.MODE_MULTI);
 				} else {
-					conversation = new Conversation(conversationName, account, jid,
+					conversation = new Conversation(conversationName, account, jid.toBareJid(),
 							Conversation.MODE_SINGLE);
 				}
 				this.databaseBackend.createConversation(conversation);
 			}
-			if (query == null) {
-				this.mMessageArchiveService.query(conversation);
-			} else {
-				if (query.getConversation() == null) {
-					this.mMessageArchiveService.query(conversation,query.getStart());
+			if (account.getXmppConnection() != null
+					&& account.getXmppConnection().getFeatures().mam()
+					&& !muc) {
+				if (query == null) {
+					this.mMessageArchiveService.query(conversation);
+				} else {
+					if (query.getConversation() == null) {
+						this.mMessageArchiveService.query(conversation, query.getStart());
+					}
 				}
 			}
+			checkDeletedFiles(conversation);
 			this.conversations.add(conversation);
 			updateConversationUi();
 			return conversation;
@@ -1067,6 +1044,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void archiveConversation(Conversation conversation) {
+		conversation.setStatus(Conversation.STATUS_ARCHIVED);
+		conversation.setNextEncryption(-1);
 		synchronized (this.conversations) {
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
 				if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
@@ -1107,7 +1086,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		sendIqPacket(account, iq, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(final Account account, final IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE_RESULT) {
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					account.setPassword(newPassword);
 					databaseBackend.updateAccount(account);
 					callback.onPasswordChangeSucceeded();
@@ -1118,11 +1097,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		});
 	}
 
-	public interface OnAccountPasswordChanged {
-		public void onPasswordChangeSucceeded();
-		public void onPasswordChangeFailed();
-	}
-
 	public void deleteAccount(final Account account) {
 		synchronized (this.conversations) {
 			for (final Conversation conversation : conversations) {
@@ -1311,7 +1285,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					&& (conversation.getAccount() == account)) {
 				conversation.resetMucOptions();
 				joinMuc(conversation);
-					}
+			}
 		}
 	}
 
@@ -1329,21 +1303,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			PresencePacket packet = new PresencePacket();
 			packet.setFrom(conversation.getAccount().getJid());
 			packet.setTo(joinJid);
-			Element x = packet.addChild("x","http://jabber.org/protocol/muc");
+			Element x = packet.addChild("x", "http://jabber.org/protocol/muc");
 			if (conversation.getMucOptions().getPassword() != null) {
 				x.addChild("password").setContent(conversation.getMucOptions().getPassword());
 			}
-			x.addChild("history").setAttribute("since",PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted()));
+			x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted()));
 			String sig = account.getPgpSignature();
 			if (sig != null) {
 				packet.addChild("status").setContent("online");
 				packet.addChild("x", "jabber:x:signed").setContent(sig);
 			}
 			sendPresencePacket(account, packet);
+			fetchConferenceConfiguration(conversation);
 			if (!joinJid.equals(conversation.getJid())) {
 				conversation.setContactJid(joinJid);
 				databaseBackend.updateConversation(conversation);
 			}
+			conversation.setHasMessagesLeftOnServer(false);
 		} else {
 			account.pendingConferenceJoins.add(conversation);
 		}
@@ -1437,7 +1413,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				return server;
 			}
 		}
-		for(Account other : getAccounts()) {
+		for (Account other : getAccounts()) {
 			if (other != account && other.getXmppConnection() != null) {
 				server = other.getXmppConnection().getMucServer();
 				if (server != null) {
@@ -1455,12 +1431,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				String server = findConferenceServer(account);
 				if (server == null) {
 					if (callback != null) {
-						callback.error(R.string.no_conference_server_found,null);
+						callback.error(R.string.no_conference_server_found, null);
 					}
 					return;
 				}
-				String name = new BigInteger(75,getRNG()).toString(32);
-				Jid jid = Jid.fromParts(name,server,null);
+				String name = new BigInteger(75, getRNG()).toString(32);
+				Jid jid = Jid.fromParts(name, server, null);
 				final Conversation conversation = findOrCreateConversation(account, jid, true);
 				joinMuc(conversation);
 				Bundle options = new Bundle();
@@ -1471,8 +1447,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				pushConferenceConfiguration(conversation, options, new OnConferenceOptionsPushed() {
 					@Override
 					public void onPushSucceeded() {
-						for(Jid invite : jids) {
-							invite(conversation,invite);
+						for (Jid invite : jids) {
+							invite(conversation, invite);
 						}
 						if (callback != null) {
 							callback.success(conversation);
@@ -1494,19 +1470,43 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		} else {
 			if (callback != null) {
-				callback.error(R.string.not_connected_try_again,null);
+				callback.error(R.string.not_connected_try_again, null);
 			}
 		}
 	}
 
-	public void pushConferenceConfiguration(final Conversation conversation,final Bundle options, final OnConferenceOptionsPushed callback) {
-		IqPacket request = new IqPacket(IqPacket.TYPE_GET);
+	public void fetchConferenceConfiguration(final Conversation conversation) {
+		IqPacket request = new IqPacket(IqPacket.TYPE.GET);
+		request.setTo(conversation.getJid().toBareJid());
+		request.query("http://jabber.org/protocol/disco#info");
+		sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				if (packet.getType() != IqPacket.TYPE.ERROR) {
+					ArrayList<String> features = new ArrayList<>();
+					for (Element child : packet.query().getChildren()) {
+						if (child != null && child.getName().equals("feature")) {
+							String var = child.getAttribute("var");
+							if (var != null) {
+								features.add(var);
+							}
+						}
+					}
+					conversation.getMucOptions().updateFeatures(features);
+					updateConversationUi();
+				}
+			}
+		});
+	}
+
+	public void pushConferenceConfiguration(final Conversation conversation, final Bundle options, final OnConferenceOptionsPushed callback) {
+		IqPacket request = new IqPacket(IqPacket.TYPE.GET);
 		request.setTo(conversation.getJid().toBareJid());
 		request.query("http://jabber.org/protocol/muc#owner");
-		sendIqPacket(conversation.getAccount(),request,new OnIqPacketReceived() {
+		sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() != IqPacket.TYPE_ERROR) {
+				if (packet.getType() != IqPacket.TYPE.ERROR) {
 					Data data = Data.parse(packet.query().findChild("x", "jabber:x:data"));
 					for (Field field : data.getFields()) {
 						if (options.containsKey(field.getName())) {
@@ -1514,13 +1514,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						}
 					}
 					data.submit();
-					IqPacket set = new IqPacket(IqPacket.TYPE_SET);
+					IqPacket set = new IqPacket(IqPacket.TYPE.SET);
 					set.setTo(conversation.getJid().toBareJid());
 					set.query("http://jabber.org/protocol/muc#owner").addChild(data);
 					sendIqPacket(account, set, new OnIqPacketReceived() {
 						@Override
 						public void onIqPacketReceived(Account account, IqPacket packet) {
-							if (packet.getType() == IqPacket.TYPE_RESULT) {
+							if (packet.getType() == IqPacket.TYPE.RESULT) {
 								if (callback != null) {
 									callback.onPushSucceeded();
 								}
@@ -1540,6 +1540,60 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		});
 	}
 
+	public void pushSubjectToConference(final Conversation conference, final String subject) {
+		MessagePacket packet = this.getMessageGenerator().conferenceSubject(conference, subject);
+		this.sendMessagePacket(conference.getAccount(), packet);
+		final MucOptions mucOptions = conference.getMucOptions();
+		final MucOptions.User self = mucOptions.getSelf();
+		if (!mucOptions.persistent() && self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
+			Bundle options = new Bundle();
+			options.putString("muc#roomconfig_persistentroom", "1");
+			this.pushConferenceConfiguration(conference, options, null);
+		}
+	}
+
+	public void changeAffiliationInConference(final Conversation conference, Jid user, MucOptions.Affiliation affiliation, final OnAffiliationChanged callback) {
+		final Jid jid = user.toBareJid();
+		IqPacket request = this.mIqGenerator.changeAffiliation(conference, jid, affiliation.toString());
+		sendIqPacket(conference.getAccount(), request, new OnIqPacketReceived() {
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
+					callback.onAffiliationChangedSuccessful(jid);
+				} else {
+					callback.onAffiliationChangeFailed(jid, R.string.could_not_change_affiliation);
+				}
+			}
+		});
+	}
+
+	public void changeAffiliationsInConference(final Conversation conference, MucOptions.Affiliation before, MucOptions.Affiliation after) {
+		List<Jid> jids = new ArrayList<>();
+		for (MucOptions.User user : conference.getMucOptions().getUsers()) {
+			if (user.getAffiliation() == before) {
+				jids.add(user.getJid());
+			}
+		}
+		IqPacket request = this.mIqGenerator.changeAffiliation(conference, jids, after.toString());
+		sendIqPacket(conference.getAccount(), request, null);
+	}
+
+	public void changeRoleInConference(final Conversation conference, final String nick, MucOptions.Role role, final OnRoleChanged callback) {
+		IqPacket request = this.mIqGenerator.changeRole(conference, nick, role.toString());
+		Log.d(Config.LOGTAG, request.toString());
+		sendIqPacket(conference.getAccount(), request, new OnIqPacketReceived() {
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				Log.d(Config.LOGTAG, packet.toString());
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
+					callback.onRoleChangedSuccessful(nick);
+				} else {
+					callback.onRoleChangeFailed(nick, R.string.could_not_change_role);
+				}
+			}
+		});
+	}
+
 	public void disconnect(Account account, boolean force) {
 		if ((account.getStatus() == Account.State.ONLINE)
 				|| (account.getStatus() == Account.State.DISABLED)) {
@@ -1560,7 +1614,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				}
 			}
 			account.getXmppConnection().disconnect(force);
-				}
+		}
 	}
 
 	@Override
@@ -1599,8 +1653,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		final Session otrSession = conversation.getOtrSession();
 		Log.d(Config.LOGTAG,
 				account.getJid().toBareJid() + " otr session established with "
-				+ conversation.getJid() + "/"
-				+ otrSession.getSessionID().getUserID());
+						+ conversation.getJid() + "/"
+						+ otrSession.getSessionID().getUserID());
 		conversation.findUnsentMessagesWithOtrEncryption(new Conversation.OnMessageFound() {
 
 			@Override
@@ -1642,7 +1696,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			try {
 				packet.setBody(otrSession
 						.transformSending(CryptoHelper.FILETRANSFER
-							+ CryptoHelper.bytesToHex(symmetricKey)));
+								+ CryptoHelper.bytesToHex(symmetricKey))[0]);
 				sendMessagePacket(account, packet);
 				conversation.setSymmetricKey(symmetricKey);
 				return true;
@@ -1660,9 +1714,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		if (account.getStatus() == Account.State.ONLINE) {
 			final boolean ask = contact.getOption(Contact.Options.ASKING);
 			final boolean sendUpdates = contact
-				.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
-				&& contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
-			final IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+					.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
+					&& contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
+			final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 			iq.query(Xmlns.ROSTER).addChild(contact.asElement());
 			account.getXmppConnection().sendIqPacket(iq, null);
 			if (sendUpdates) {
@@ -1677,12 +1731,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void publishAvatar(final Account account,
-			final Uri image,
-			final UiCallback<Avatar> callback) {
+							  final Uri image,
+							  final UiCallback<Avatar> callback) {
 		final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
 		final int size = Config.AVATAR_SIZE;
 		final Avatar avatar = getFileBackend()
-			.getPepAvatar(image, size, format);
+				.getPepAvatar(image, size, format);
 		if (avatar != null) {
 			avatar.height = size;
 			avatar.width = size;
@@ -1702,15 +1756,15 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket result) {
-					if (result.getType() == IqPacket.TYPE_RESULT) {
+					if (result.getType() == IqPacket.TYPE.RESULT) {
 						final IqPacket packet = XmppConnectionService.this.mIqGenerator
-							.publishAvatarMetadata(avatar);
+								.publishAvatarMetadata(avatar);
 						sendIqPacket(account, packet, new OnIqPacketReceived() {
 
 							@Override
 							public void onIqPacketReceived(Account account,
-									IqPacket result) {
-								if (result.getType() == IqPacket.TYPE_RESULT) {
+														   IqPacket result) {
+								if (result.getType() == IqPacket.TYPE.RESULT) {
 									if (account.setAvatar(avatar.getFilename())) {
 										databaseBackend.updateAccount(account);
 									}
@@ -1739,15 +1793,15 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void fetchAvatar(Account account, final Avatar avatar,
-			final UiCallback<Avatar> callback) {
+							final UiCallback<Avatar> callback) {
 		IqPacket packet = this.mIqGenerator.retrieveAvatar(avatar);
 		sendIqPacket(account, packet, new OnIqPacketReceived() {
 
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket result) {
 				final String ERROR = account.getJid().toBareJid()
-					+ ": fetching avatar for " + avatar.owner + " failed ";
-				if (result.getType() == IqPacket.TYPE_RESULT) {
+						+ ": fetching avatar for " + avatar.owner + " failed ";
+				if (result.getType() == IqPacket.TYPE.RESULT) {
 					avatar.image = mIqParser.avatarData(result);
 					if (avatar.image != null) {
 						if (getFileBackend().save(avatar)) {
@@ -1760,7 +1814,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 								updateAccountUi();
 							} else {
 								Contact contact = account.getRoster()
-									.getContact(avatar.owner);
+										.getContact(avatar.owner);
 								contact.setAvatar(avatar.getFilename());
 								getAvatarService().clear(contact);
 								updateConversationUi();
@@ -1795,13 +1849,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void checkForAvatar(Account account,
-			final UiCallback<Avatar> callback) {
+							   final UiCallback<Avatar> callback) {
 		IqPacket packet = this.mIqGenerator.retrieveAvatarMetaData(null);
 		this.sendIqPacket(account, packet, new OnIqPacketReceived() {
 
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE_RESULT) {
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					Element pubsub = packet.findChild("pubsub",
 							"http://jabber.org/protocol/pubsub");
 					if (pubsub != null) {
@@ -1835,7 +1889,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		contact.setOption(Contact.Options.DIRTY_DELETE);
 		Account account = contact.getAccount();
 		if (account.getStatus() == Account.State.ONLINE) {
-			IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+			IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 			Element item = iq.query(Xmlns.ROSTER).addChild("item");
 			item.setAttribute("jid", contact.getJid().toString());
 			item.setAttribute("subscription", "remove");
@@ -1861,8 +1915,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 					Thread thread = new Thread(account.getXmppConnection());
 					thread.start();
-					scheduleWakeupCall((int) (Config.CONNECT_TIMEOUT * 1.2),
-							false);
+					scheduleWakeUpCall(Config.CONNECT_TIMEOUT, account.getUuid().hashCode());
 				} else {
 					account.getRoster().clearPresences();
 					account.setXmppConnection(null);
@@ -1891,7 +1944,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public boolean markMessage(final Account account, final Jid recipient, final String uuid,
-			final int status) {
+							   final int status) {
 		if (uuid == null) {
 			return false;
 		} else {
@@ -1899,20 +1952,20 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				if (conversation.getJid().equals(recipient)
 						&& conversation.getAccount().equals(account)) {
 					return markMessage(conversation, uuid, status);
-						}
+				}
 			}
 			return false;
 		}
 	}
 
 	public boolean markMessage(Conversation conversation, String uuid,
-			int status) {
+							   int status) {
 		if (uuid == null) {
 			return false;
 		} else {
 			Message message = conversation.findSentMessageWithUuid(uuid);
-			if (message!=null) {
-				markMessage(message,status);
+			if (message != null) {
+				markMessage(message, status);
 				return true;
 			} else {
 				return false;
@@ -1923,9 +1976,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void markMessage(Message message, int status) {
 		if (status == Message.STATUS_SEND_FAILED
 				&& (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
-					.getStatus() == Message.STATUS_SEND_DISPLAYED)) {
+				.getStatus() == Message.STATUS_SEND_DISPLAYED)) {
 			return;
-					}
+		}
 		message.setStatus(status);
 		databaseBackend.updateMessage(message);
 		updateConversationUi();
@@ -1933,7 +1986,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public SharedPreferences getPreferences() {
 		return PreferenceManager
-			.getDefaultSharedPreferences(getApplicationContext());
+				.getDefaultSharedPreferences(getApplicationContext());
 	}
 
 	public boolean forceEncryption() {
@@ -2009,11 +2062,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		final Message markable = conversation.getLatestMarkableMessage();
 		this.markRead(conversation);
 		if (confirmMessages() && markable != null && markable.getRemoteMsgId() != null) {
-			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid()+ ": sending read marker to " + markable.getCounterpart().toString());
+			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
 			Account account = conversation.getAccount();
 			final Jid to = markable.getCounterpart();
 			MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId());
-			this.sendMessagePacket(conversation.getAccount(),packet);
+			this.sendMessagePacket(conversation.getAccount(), packet);
 		}
 		updateConversationUi();
 	}
@@ -2090,13 +2143,17 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public void sendIqPacket(final Account account, final IqPacket packet, final PacketReceived callback) {
+	public void sendIqPacket(final Account account, final IqPacket packet, final OnIqPacketReceived callback) {
 		final XmppConnection connection = account.getXmppConnection();
 		if (connection != null) {
 			connection.sendIqPacket(packet, callback);
 		}
 	}
 
+	public void sendPresence(final Account account) {
+		sendPresencePacket(account, mPresenceGenerator.sendPresence(account));
+	}
+
 	public MessageGenerator getMessageGenerator() {
 		return this.mMessageGenerator;
 	}
@@ -2109,7 +2166,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return this.mIqGenerator;
 	}
 
-	public IqParser getIqParser() { return this.mIqParser; }
+	public IqParser getIqParser() {
+		return this.mIqParser;
+	}
 
 	public JingleConnectionManager getJingleConnectionManager() {
 		return this.mJingleConnectionManager;
@@ -2168,33 +2227,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}).start();
 	}
 
-	public interface OnConversationUpdate {
-		public void onConversationUpdate();
-	}
-
-	public interface OnAccountUpdate {
-		public void onAccountUpdate();
-	}
-
-	public interface OnRosterUpdate {
-		public void onRosterUpdate();
-	}
-
-	public interface OnMucRosterUpdate {
-		public void onMucRosterUpdate();
-	}
-
-	private interface OnConferenceOptionsPushed {
-		public void onPushSucceeded();
-		public void onPushFailed();
-	}
-
-	public class XmppConnectionBinder extends Binder {
-		public XmppConnectionService getService() {
-			return XmppConnectionService.this;
-		}
-	}
-
 	public void sendBlockRequest(final Blockable blockable) {
 		if (blockable != null && blockable.getBlockedJid() != null) {
 			final Jid jid = blockable.getBlockedJid();
@@ -2202,7 +2234,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 				@Override
 				public void onIqPacketReceived(final Account account, final IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE_RESULT) {
+					if (packet.getType() == IqPacket.TYPE.RESULT) {
 						account.getBlocklist().add(jid);
 						updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
 					}
@@ -2217,7 +2249,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			this.sendIqPacket(blockable.getAccount(), getIqGenerator().generateSetUnblockRequest(jid), new OnIqPacketReceived() {
 				@Override
 				public void onIqPacketReceived(final Account account, final IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE_RESULT) {
+					if (packet.getType() == IqPacket.TYPE.RESULT) {
 						account.getBlocklist().remove(jid);
 						updateBlocklistUi(OnUpdateBlocklist.Status.UNBLOCKED);
 					}
@@ -2225,4 +2257,56 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			});
 		}
 	}
+
+	public interface OnMoreMessagesLoaded {
+		public void onMoreMessagesLoaded(int count, Conversation conversation);
+
+		public void informUser(int r);
+	}
+
+	public interface OnAccountPasswordChanged {
+		public void onPasswordChangeSucceeded();
+
+		public void onPasswordChangeFailed();
+	}
+
+	public interface OnAffiliationChanged {
+		public void onAffiliationChangedSuccessful(Jid jid);
+
+		public void onAffiliationChangeFailed(Jid jid, int resId);
+	}
+
+	public interface OnRoleChanged {
+		public void onRoleChangedSuccessful(String nick);
+
+		public void onRoleChangeFailed(String nick, int resid);
+	}
+
+	public interface OnConversationUpdate {
+		public void onConversationUpdate();
+	}
+
+	public interface OnAccountUpdate {
+		public void onAccountUpdate();
+	}
+
+	public interface OnRosterUpdate {
+		public void onRosterUpdate();
+	}
+
+	public interface OnMucRosterUpdate {
+		public void onMucRosterUpdate();
+	}
+
+	public interface OnConferenceOptionsPushed {
+		public void onPushSucceeded();
+
+		public void onPushFailed();
+	}
+
+	public class XmppConnectionBinder extends Binder {
+		public XmppConnectionService getService() {
+			return XmppConnectionService.this;
+		}
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index eeb015f3..399d9fdf 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -1,8 +1,10 @@
 package eu.siacs.conversations.ui;
 
 import android.annotation.TargetApi;
+import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.IntentSender.SendIntentException;
 import android.graphics.Bitmap;
 import android.os.Build;
@@ -31,12 +33,14 @@ import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Bookmark;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.entities.MucOptions.User;
+import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate;
 import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate;
-import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
-public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate {
+public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoleChanged, XmppConnectionService.OnConferenceOptionsPushed {
 	public static final String ACTION_VIEW_MUC = "view_muc";
 	private Conversation mConversation;
 	private OnClickListener inviteListener = new OnClickListener() {
@@ -54,11 +58,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	private TextView mAccountJid;
 	private LinearLayout membersView;
 	private LinearLayout mMoreDetails;
+	private TextView mConferenceType;
+	private ImageButton mChangeConferenceSettingsButton;
 	private Button mInviteButton;
 	private String uuid = null;
-	private List<User> users = new ArrayList<>();
 	private User mSelectedUser = null;
 
+	private boolean mAdvancedMode = false;
+
 	private UiCallback<Conversation> renameCallback = new UiCallback<Conversation>() {
 		@Override
 		public void success(Conversation object) {
@@ -66,7 +73,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 				@Override
 				public void run() {
 					Toast.makeText(ConferenceDetailsActivity.this,getString(R.string.your_nick_has_been_changed),Toast.LENGTH_SHORT).show();
-					populateView();
+					updateView();
 				}
 			});
 
@@ -87,6 +94,51 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 		}
 	};
+	private OnClickListener mChangeConferenceSettings = new OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			final MucOptions mucOptions = mConversation.getMucOptions();
+			AlertDialog.Builder builder = new AlertDialog.Builder(ConferenceDetailsActivity.this);
+			builder.setTitle(R.string.conference_options);
+			String[] options = {getString(R.string.members_only),
+					getString(R.string.non_anonymous)};
+			final boolean[] values = new boolean[options.length];
+			values[0] = mucOptions.membersOnly();
+			values[1] = mucOptions.nonanonymous();
+			builder.setMultiChoiceItems(options,values,new DialogInterface.OnMultiChoiceClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+					values[which] = isChecked;
+				}
+			});
+			builder.setNegativeButton(R.string.cancel, null);
+			builder.setPositiveButton(R.string.confirm,new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					if (!mucOptions.membersOnly() && values[0]) {
+						xmppConnectionService.changeAffiliationsInConference(mConversation,
+								MucOptions.Affiliation.NONE,
+								MucOptions.Affiliation.MEMBER);
+					}
+					Bundle options = new Bundle();
+					options.putString("muc#roomconfig_membersonly", values[0] ? "1" : "0");
+					options.putString("muc#roomconfig_whois", values[1] ? "anyone" : "moderators");
+					options.putString("muc#roomconfig_persistentroom", "1");
+					xmppConnectionService.pushConferenceConfiguration(mConversation,
+							options,
+							ConferenceDetailsActivity.this);
+				}
+			});
+			builder.create().show();
+		}
+	};
+	private OnValueEdited onSubjectEdited = new OnValueEdited() {
+
+		@Override
+		public void onValueEdited(String value) {
+			xmppConnectionService.pushSubjectToConference(mConversation,value);
+		}
+	};
 
 	@Override
 	public void onConversationUpdate() {
@@ -94,7 +146,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 			@Override
 			public void run() {
-				populateView();
+				updateView();
 			}
 		});
 	}
@@ -105,7 +157,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 			@Override
 			public void run() {
-				populateView();
+				updateView();
 			}
 		});
 	}
@@ -122,8 +174,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		mAccountJid = (TextView) findViewById(R.id.details_account);
 		mMoreDetails = (LinearLayout) findViewById(R.id.muc_more_details);
 		mMoreDetails.setVisibility(View.GONE);
+		mChangeConferenceSettingsButton = (ImageButton) findViewById(R.id.change_conference_button);
+		mChangeConferenceSettingsButton.setOnClickListener(this.mChangeConferenceSettings);
+		mConferenceType = (TextView) findViewById(R.id.muc_conference_type);
 		mInviteButton = (Button) findViewById(R.id.invite);
 		mInviteButton.setOnClickListener(inviteListener);
+		mConferenceType = (TextView) findViewById(R.id.muc_conference_type);
 		if (getActionBar() != null) {
 			getActionBar().setHomeButtonEnabled(true);
 			getActionBar().setDisplayHomeAsUpEnabled(true);
@@ -152,17 +208,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 				break;
 			case R.id.action_edit_subject:
 				if (mConversation != null) {
-					quickEdit(mConversation.getName(), new OnValueEdited() {
-
-						@Override
-						public void onValueEdited(String value) {
-							MessagePacket packet = xmppConnectionService
-								.getMessageGenerator().conferenceSubject(
-										mConversation, value);
-							xmppConnectionService.sendMessagePacket(
-									mConversation.getAccount(), packet);
-						}
-					});
+					quickEdit(mConversation.getName(),this.onSubjectEdited);
 				}
 				break;
 			case R.id.action_save_as_bookmark:
@@ -171,23 +217,16 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.action_delete_bookmark:
 				deleteBookmark();
 				break;
+			case R.id.action_advanced_mode:
+				this.mAdvancedMode = !menuItem.isChecked();
+				menuItem.setChecked(this.mAdvancedMode);
+				invalidateOptionsMenu();
+				updateView();
+				break;
 		}
 		return super.onOptionsItemSelected(menuItem);
 	}
 
-	public String getReadableRole(int role) {
-		switch (role) {
-			case User.ROLE_MODERATOR:
-				return getString(R.string.moderator);
-			case User.ROLE_PARTICIPANT:
-				return getString(R.string.participant);
-			case User.ROLE_VISITOR:
-				return getString(R.string.visitor);
-			default:
-				return "";
-		}
-	}
-
 	@Override
 	protected String getShareableUri() {
 		if (mConversation != null) {
@@ -201,6 +240,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	public boolean onPrepareOptionsMenu(Menu menu) {
 		MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark);
 		MenuItem menuItemDeleteBookmark = menu.findItem(R.id.action_delete_bookmark);
+		MenuItem menuItemAdvancedMode = menu.findItem(R.id.action_advanced_mode);
+		menuItemAdvancedMode.setChecked(mAdvancedMode);
 		Account account = mConversation.getAccount();
 		if (account.hasBookmarkFor(mConversation.getJid().toBareJid())) {
 			menuItemSaveBookmark.setVisible(false);
@@ -224,21 +265,45 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		if (tag instanceof User) {
 			getMenuInflater().inflate(R.menu.muc_details_context,menu);
 			final User user = (User) tag;
+			final User self = mConversation.getMucOptions().getSelf();
 			this.mSelectedUser = user;
 			String name;
-			final Contact contact = user.getContact();
-			if (contact != null) {
-				name = contact.getDisplayName();
-			} else if (user.getJid() != null) {
-				name = user.getJid().toBareJid().toString();
-			} else {
-				name = user.getName();
-			}
-			menu.setHeaderTitle(name);
-			MenuItem startConversation = menu.findItem(R.id.start_conversation);
-			if (user.getJid() == null) {
-				startConversation.setVisible(false);
+			if (user.getJid() != null) {
+				final Contact contact = user.getContact();
+				if (contact != null) {
+					name = contact.getDisplayName();
+				} else {
+					name = user.getJid().toBareJid().toString();
+				}
+				menu.setHeaderTitle(name);
+				MenuItem startConversation = menu.findItem(R.id.start_conversation);
+				MenuItem giveMembership = menu.findItem(R.id.give_membership);
+				MenuItem removeMembership = menu.findItem(R.id.remove_membership);
+				MenuItem giveAdminPrivileges = menu.findItem(R.id.give_admin_privileges);
+				MenuItem removeAdminPrivileges = menu.findItem(R.id.remove_admin_privileges);
+				MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room);
+				MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
+				startConversation.setVisible(true);
+				if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) &&
+						self.getAffiliation().outranks(user.getAffiliation())) {
+					if (mAdvancedMode) {
+						if (user.getAffiliation() == MucOptions.Affiliation.NONE) {
+							giveMembership.setVisible(true);
+						} else {
+							removeMembership.setVisible(true);
+						}
+						banFromConference.setVisible(true);
+					} else {
+						removeFromRoom.setVisible(true);
+					}
+					if (user.getAffiliation() != MucOptions.Affiliation.ADMIN) {
+						giveAdminPrivileges.setVisible(true);
+					} else {
+						removeAdminPrivileges.setVisible(true);
+					}
+				}
 			}
+
 		}
 		super.onCreateContextMenu(menu,v,menuInfo);
 	}
@@ -249,11 +314,50 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.start_conversation:
 				startConversation(mSelectedUser);
 				return true;
+			case R.id.give_admin_privileges:
+				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.ADMIN,this);
+				return true;
+			case R.id.give_membership:
+				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.MEMBER,this);
+				return true;
+			case R.id.remove_membership:
+				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.NONE,this);
+				return true;
+			case R.id.remove_admin_privileges:
+				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.MEMBER,this);
+				return true;
+			case R.id.remove_from_room:
+				removeFromRoom(mSelectedUser);
+				return true;
+			case R.id.ban_from_conference:
+				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.OUTCAST,this);
+				xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,this);
+				return true;
 			default:
 				return super.onContextItemSelected(item);
 		}
 	}
 
+	private void removeFromRoom(final User user) {
+		if (mConversation.getMucOptions().membersOnly()) {
+			xmppConnectionService.changeAffiliationInConference(mConversation,user.getJid(), MucOptions.Affiliation.NONE,this);
+			xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,ConferenceDetailsActivity.this);
+		} else {
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setTitle(R.string.ban_from_conference);
+			builder.setMessage(getString(R.string.removing_from_public_conference,user.getName()));
+			builder.setNegativeButton(R.string.cancel,null);
+			builder.setPositiveButton(R.string.ban_now,new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					xmppConnectionService.changeAffiliationInConference(mConversation,user.getJid(), MucOptions.Affiliation.OUTCAST,ConferenceDetailsActivity.this);
+					xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,ConferenceDetailsActivity.this);
+				}
+			});
+			builder.create().show();
+		}
+	}
+
 	protected void startConversation(User user) {
 		if (user.getJid() != null) {
 			Conversation conversation = xmppConnectionService.findOrCreateConversation(this.mConversation.getAccount(),user.getJid().toBareJid(),false);
@@ -290,39 +394,41 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			this.mConversation = xmppConnectionService
 				.findConversationByUuid(uuid);
 			if (this.mConversation != null) {
-				populateView();
+				updateView();
 			}
 		}
 	}
 
-	private void populateView() {
+	private void updateView() {
+		final MucOptions mucOptions = mConversation.getMucOptions();
+		final User self = mucOptions.getSelf();
 		mAccountJid.setText(getString(R.string.using_account, mConversation
 					.getAccount().getJid().toBareJid()));
-		mYourPhoto.setImageBitmap(avatarService().get(
-					mConversation.getAccount(), getPixel(48)));
+		mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48)));
 		setTitle(mConversation.getName());
 		mFullJid.setText(mConversation.getJid().toBareJid().toString());
-		mYourNick.setText(mConversation.getMucOptions().getActualNick());
+		mYourNick.setText(mucOptions.getActualNick());
 		mRoleAffiliaton = (TextView) findViewById(R.id.muc_role);
-		if (mConversation.getMucOptions().online()) {
+		if (mucOptions.online()) {
 			mMoreDetails.setVisibility(View.VISIBLE);
-			User self = mConversation.getMucOptions().getSelf();
-			switch (self.getAffiliation()) {
-				case User.AFFILIATION_ADMIN:
-					mRoleAffiliaton.setText(getReadableRole(self.getRole()) + " ("
-							+ getString(R.string.admin) + ")");
-					break;
-				case User.AFFILIATION_OWNER:
-					mRoleAffiliaton.setText(getReadableRole(self.getRole()) + " ("
-							+ getString(R.string.owner) + ")");
-					break;
-				default:
-					mRoleAffiliaton.setText(getReadableRole(self.getRole()));
-					break;
+			final String status = getStatus(self);
+			if (status != null) {
+				mRoleAffiliaton.setVisibility(View.VISIBLE);
+				mRoleAffiliaton.setText(status);
+			} else {
+				mRoleAffiliaton.setVisibility(View.GONE);
+			}
+			if (mucOptions.membersOnly()) {
+				mConferenceType.setText(R.string.private_conference);
+			} else {
+				mConferenceType.setText(R.string.public_conference);
+			}
+			if (self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
+				mChangeConferenceSettingsButton.setVisibility(View.VISIBLE);
+			} else {
+				mChangeConferenceSettingsButton.setVisibility(View.GONE);
 			}
 		}
-		this.users.clear();
-		this.users.addAll(mConversation.getMucOptions().getUsers());
 		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		membersView.removeAllViews();
 		for (final User user : mConversation.getMucOptions().getUsers()) {
@@ -337,36 +443,53 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			});
 			registerForContextMenu(view);
 			view.setTag(user);
-			TextView name = (TextView) view
-				.findViewById(R.id.contact_display_name);
-			TextView key = (TextView) view.findViewById(R.id.key);
-			TextView role = (TextView) view.findViewById(R.id.contact_jid);
-			if (user.getPgpKeyId() != 0) {
-				key.setVisibility(View.VISIBLE);
-				key.setOnClickListener(new OnClickListener() {
+			TextView tvDisplayName = (TextView) view.findViewById(R.id.contact_display_name);
+			TextView tvKey = (TextView) view.findViewById(R.id.key);
+			TextView tvStatus = (TextView) view.findViewById(R.id.contact_jid);
+			if (mAdvancedMode && user.getPgpKeyId() != 0) {
+				tvKey.setVisibility(View.VISIBLE);
+				tvKey.setOnClickListener(new OnClickListener() {
 
 					@Override
 					public void onClick(View v) {
 						viewPgpKey(user);
 					}
 				});
-				key.setText(OpenPgpUtils.convertKeyIdToHex(user.getPgpKeyId()));
+				tvKey.setText(OpenPgpUtils.convertKeyIdToHex(user.getPgpKeyId()));
 			}
 			Bitmap bm;
 			Contact contact = user.getContact();
 			if (contact != null) {
 				bm = avatarService().get(contact, getPixel(48));
-				name.setText(contact.getDisplayName());
-				role.setText(user.getName() + " \u2022 "
-						+ getReadableRole(user.getRole()));
+				tvDisplayName.setText(contact.getDisplayName());
+				tvStatus.setText(user.getName() + " \u2022 " + getStatus(user));
 			} else {
 				bm = avatarService().get(user.getName(), getPixel(48));
-				name.setText(user.getName());
-				role.setText(getReadableRole(user.getRole()));
+				tvDisplayName.setText(user.getName());
+				tvStatus.setText(getStatus(user));
+
 			}
 			ImageView iv = (ImageView) view.findViewById(R.id.contact_photo);
 			iv.setImageBitmap(bm);
 			membersView.addView(view);
+			if (mConversation.getMucOptions().canInvite()) {
+				mInviteButton.setVisibility(View.VISIBLE);
+			} else {
+				mInviteButton.setVisibility(View.GONE);
+			}
+		}
+	}
+
+	private String getStatus(User user) {
+		if (mAdvancedMode) {
+			StringBuilder builder = new StringBuilder();
+			builder.append(getString(user.getAffiliation().getResId()));
+			builder.append(" (");
+			builder.append(getString(user.getRole().getResId()));
+			builder.append(')');
+			return builder.toString();
+		} else {
+			return getString(user.getAffiliation().getResId());
 		}
 	}
 
@@ -396,4 +519,43 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			}
 		}
 	}
+
+	@Override
+	public void onAffiliationChangedSuccessful(Jid jid) {
+
+	}
+
+	@Override
+	public void onAffiliationChangeFailed(Jid jid, int resId) {
+		displayToast(getString(resId,jid.toBareJid().toString()));
+	}
+
+	@Override
+	public void onRoleChangedSuccessful(String nick) {
+
+	}
+
+	@Override
+	public void onRoleChangeFailed(String nick, int resId) {
+		displayToast(getString(resId,nick));
+	}
+
+	@Override
+	public void onPushSucceeded() {
+		displayToast(getString(R.string.modified_conference_options));
+	}
+
+	@Override
+	public void onPushFailed() {
+		displayToast(getString(R.string.could_not_modify_conference_options));
+	}
+
+	private void displayToast(final String msg) {
+		runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(ConferenceDetailsActivity.this,msg,Toast.LENGTH_SHORT).show();
+			}
+		});
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 657ae75b..fda0c617 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -18,6 +18,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -40,6 +41,7 @@ import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
+import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
@@ -51,9 +53,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 		@Override
 		public void onClick(DialogInterface dialog, int which) {
-			ContactDetailsActivity.this.xmppConnectionService
-				.deleteContactOnServer(contact);
-			ContactDetailsActivity.this.finish();
+			xmppConnectionService.deleteContactOnServer(contact);
 		}
 	};
 	private OnCheckedChangeListener mOnSendCheckedChange = new OnCheckedChangeListener() {
@@ -102,6 +102,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 	private TextView lastseen;
 	private CheckBox send;
 	private CheckBox receive;
+	private Button addContactButton;
 	private QuickContactBadge badge;
 	private LinearLayout keys;
 	private LinearLayout tags;
@@ -142,6 +143,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 			@Override
 			public void run() {
+				invalidateOptionsMenu();
 				populateView();
 			}
 		});
@@ -153,6 +155,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 			@Override
 			public void run() {
+				invalidateOptionsMenu();
 				populateView();
 			}
 		});
@@ -188,6 +191,13 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		send = (CheckBox) findViewById(R.id.details_send_presence);
 		receive = (CheckBox) findViewById(R.id.details_receive_presence);
 		badge = (QuickContactBadge) findViewById(R.id.details_contact_badge);
+		addContactButton = (Button) findViewById(R.id.add_contact_button);
+		addContactButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				showAddToRosterDialog(contact);
+			}
+		});
 		keys = (LinearLayout) findViewById(R.id.details_contact_keys);
 		tags = (LinearLayout) findViewById(R.id.tags);
 		if (getActionBar() != null) {
@@ -201,7 +211,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 	@Override
 	public boolean onOptionsItemSelected(final MenuItem menuItem) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		switch (menuItem.getItemId()) {
 			case android.R.id.home:
@@ -237,59 +247,96 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 					startActivity(intent);
 				}
 				break;
+			case R.id.action_block:
+				BlockContactDialog.show(this, xmppConnectionService, contact);
+				break;
+			case R.id.action_unblock:
+				BlockContactDialog.show(this, xmppConnectionService, contact);
+				break;
 		}
 		return super.onOptionsItemSelected(menuItem);
 	}
 
 	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
+	public boolean onCreateOptionsMenu(final Menu menu) {
 		getMenuInflater().inflate(R.menu.contact_details, menu);
+		MenuItem block = menu.findItem(R.id.action_block);
+		MenuItem unblock = menu.findItem(R.id.action_unblock);
+		MenuItem edit = menu.findItem(R.id.action_edit_contact);
+		MenuItem delete = menu.findItem(R.id.action_delete_contact);
+		final XmppConnection connection = contact.getAccount().getXmppConnection();
+		if (connection != null && connection.getFeatures().blocking()) {
+			if (this.contact.isBlocked()) {
+				menu.findItem(R.id.action_block).setVisible(false);
+			} else {
+				menu.findItem(R.id.action_unblock).setVisible(false);
+			}
+		} else {
+			menu.findItem(R.id.action_unblock).setVisible(false);
+			menu.findItem(R.id.action_block).setVisible(false);
+		}
+		if (!contact.showInRoster()) {
+			edit.setVisible(false);
+			delete.setVisible(false);
+		}
 		return true;
 	}
 
 	private void populateView() {
-		send.setOnCheckedChangeListener(null);
-		receive.setOnCheckedChangeListener(null);
 		setTitle(contact.getDisplayName());
-		if (contact.getOption(Contact.Options.FROM)) {
-			send.setText(R.string.send_presence_updates);
-			send.setChecked(true);
-		} else if (contact
-				.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-			send.setChecked(false);
-			send.setText(R.string.send_presence_updates);
-		} else {
-			send.setText(R.string.preemptively_grant);
-			if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
+		if (contact.showInRoster()) {
+			send.setVisibility(View.VISIBLE);
+			receive.setVisibility(View.VISIBLE);
+			addContactButton.setVisibility(View.GONE);
+			send.setOnCheckedChangeListener(null);
+			receive.setOnCheckedChangeListener(null);
+
+			if (contact.getOption(Contact.Options.FROM)) {
+				send.setText(R.string.send_presence_updates);
 				send.setChecked(true);
-			} else {
+			} else if (contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
 				send.setChecked(false);
+				send.setText(R.string.send_presence_updates);
+			} else {
+				send.setText(R.string.preemptively_grant);
+				if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
+					send.setChecked(true);
+				} else {
+					send.setChecked(false);
+				}
 			}
-		}
-		if (contact.getOption(Contact.Options.TO)) {
-			receive.setText(R.string.receive_presence_updates);
-			receive.setChecked(true);
-		} else {
-			receive.setText(R.string.ask_for_presence_updates);
-			if (contact.getOption(Contact.Options.ASKING)) {
+			if (contact.getOption(Contact.Options.TO)) {
+				receive.setText(R.string.receive_presence_updates);
 				receive.setChecked(true);
 			} else {
-				receive.setChecked(false);
+				receive.setText(R.string.ask_for_presence_updates);
+				if (contact.getOption(Contact.Options.ASKING)) {
+					receive.setChecked(true);
+				} else {
+					receive.setChecked(false);
+				}
 			}
-		}
-		if (contact.getAccount().getStatus() == Account.State.ONLINE) {
-			receive.setEnabled(true);
-			send.setEnabled(true);
+			if (contact.getAccount().isOnlineAndConnected()) {
+				receive.setEnabled(true);
+				send.setEnabled(true);
+			} else {
+				receive.setEnabled(false);
+				send.setEnabled(false);
+			}
+
+			send.setOnCheckedChangeListener(this.mOnSendCheckedChange);
+			receive.setOnCheckedChangeListener(this.mOnReceiveCheckedChange);
 		} else {
-			receive.setEnabled(false);
-			send.setEnabled(false);
+			addContactButton.setVisibility(View.VISIBLE);
+			send.setVisibility(View.GONE);
+			receive.setVisibility(View.GONE);
 		}
 
-		send.setOnCheckedChangeListener(this.mOnSendCheckedChange);
-		receive.setOnCheckedChangeListener(this.mOnReceiveCheckedChange);
-
-		lastseen.setText(UIHelper.lastseen(getApplicationContext(),
-					contact.lastseen.time));
+		if (contact.isBlocked() && !this.showDynamicTags) {
+			lastseen.setText(R.string.contact_blocked);
+		} else {
+			lastseen.setText(UIHelper.lastseen(getApplicationContext(), contact.lastseen.time));
+		}
 
 		if (contact.getPresences().size() > 1) {
 			contactJidTv.setText(contact.getJid() + " ("
@@ -424,6 +471,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 			@Override
 			public void run() {
+				invalidateOptionsMenu();
 				populateView();
 			}
 		});
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 5cfc1116..0a55c6b5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -9,8 +9,8 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
-import android.media.MediaActionSound;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.provider.MediaStore;
@@ -49,8 +49,11 @@ import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
 public class ConversationActivity extends XmppActivity
 	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist {
 
+	public static final String ACTION_DOWNLOAD = "eu.siacs.conversations.action.DOWNLOAD";
+
 	public static final String VIEW_CONVERSATION = "viewConversation";
 	public static final String CONVERSATION = "conversationUuid";
+	public static final String MESSAGE = "messageUuid";
 	public static final String TEXT = "text";
 	public static final String NICK = "nick";
 
@@ -83,11 +86,6 @@ public class ConversationActivity extends XmppActivity
 
 	private boolean mActivityPaused = false;
 
-
-	public List<Conversation> getConversationList() {
-		return this.conversationList;
-	}
-
 	public Conversation getSelectedConversation() {
 		return this.mSelectedConversation;
 	}
@@ -139,7 +137,7 @@ public class ConversationActivity extends XmppActivity
 	}
 
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		if (savedInstanceState != null) {mOpenConverstaion = savedInstanceState.getString(
 				STATE_OPEN_CONVERSATION, null);
@@ -176,6 +174,7 @@ public class ConversationActivity extends XmppActivity
 					ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
 				}
 				hideConversationsOverview();
+				openConversation();
 			}
 		});
 		mContentView = findViewById(R.id.content_view_spl);
@@ -260,11 +259,16 @@ public class ConversationActivity extends XmppActivity
 			xmppConnectionService.getNotificationService().setOpenConversation(conversation);
 			sendReadMarkerIfNecessary(conversation);
 		}
+		listAdapter.notifyDataSetChanged();
 	}
 
 	public void sendReadMarkerIfNecessary(final Conversation conversation) {
-		if (!mActivityPaused && !conversation.isRead()) {
-			xmppConnectionService.sendReadMarker(conversation);
+		if (!mActivityPaused && conversation != null) {
+			if (!conversation.isRead()) {
+				xmppConnectionService.sendReadMarker(conversation);
+			} else {
+				xmppConnectionService.markRead(conversation);
+			}
 		}
 	}
 
@@ -281,11 +285,8 @@ public class ConversationActivity extends XmppActivity
 		final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
 		final MenuItem menuMute = menu.findItem(R.id.action_mute);
 		final MenuItem menuUnmute = menu.findItem(R.id.action_unmute);
-		final MenuItem menuBlock = menu.findItem(R.id.action_block);
-		final MenuItem menuUnblock = menu.findItem(R.id.action_unblock);
 
-		if (isConversationsOverviewVisable()
-				&& isConversationsOverviewHideable()) {
+		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
 			menuArchive.setVisible(false);
 			menuMucDetails.setVisible(false);
 			menuContactDetails.setVisible(false);
@@ -295,33 +296,24 @@ public class ConversationActivity extends XmppActivity
 			menuClearHistory.setVisible(false);
 			menuMute.setVisible(false);
 			menuUnmute.setVisible(false);
-			menuBlock.setVisible(false);
-			menuUnblock.setVisible(false);
 		} else {
 			menuAdd.setVisible(!isConversationsOverviewHideable());
 			if (this.getSelectedConversation() != null) {
 				if (this.getSelectedConversation().getLatestMessage()
 						.getEncryption() != Message.ENCRYPTION_NONE) {
-					menuSecure.setIcon(R.drawable.ic_action_secure);
-						}
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+						menuSecure.setIcon(R.drawable.ic_lock_outline_white_48dp);
+					} else {
+						menuSecure.setIcon(R.drawable.ic_action_secure);
+					}
+				}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
 					menuAttach.setVisible(false);
-					menuBlock.setVisible(false);
-					menuUnblock.setVisible(false);
+					menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite());
 				} else {
 					menuMucDetails.setVisible(false);
-					menuInviteContact.setTitle(R.string.conference_with);
-					if (this.getSelectedConversation().isBlocked()) {
-						menuBlock.setVisible(false);
-					} else {
-						menuUnblock.setVisible(false);
-					}
 					final Account account = this.getSelectedConversation().getAccount();
-					if (!(account.isOnlineAndConnected() && account.getXmppConnection().getFeatures().blocking())) {
-						menuBlock.setVisible(false);
-						menuUnblock.setVisible(false);
-					}
 				}
 				if (this.getSelectedConversation().isMuted()) {
 					menuMute.setVisible(false);
@@ -447,12 +439,7 @@ public class ConversationActivity extends XmppActivity
 					this.endConversation(getSelectedConversation());
 					break;
 				case R.id.action_contact_details:
-					Contact contact = this.getSelectedConversation().getContact();
-					if (contact.showInRoster()) {
-						switchToContactDetails(contact);
-					} else {
-						showAddToRosterDialog(getSelectedConversation());
-					}
+					switchToContactDetails(getSelectedConversation().getContact());
 					break;
 				case R.id.action_muc_details:
 					Intent intent = new Intent(this,
@@ -492,7 +479,6 @@ public class ConversationActivity extends XmppActivity
 	}
 
 	public void endConversation(Conversation conversation) {
-		conversation.setStatus(Conversation.STATUS_ARCHIVED);
 		showConversationsOverview();
 		xmppConnectionService.archiveConversation(conversation);
 		if (conversationList.size() > 0) {
@@ -542,25 +528,25 @@ public class ConversationActivity extends XmppActivity
 		}
 		attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 
-				@Override
-				public boolean onMenuItemClick(MenuItem item) {
-					switch (item.getItemId()) {
-						case R.id.attach_choose_picture:
-							attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
-							break;
-						case R.id.attach_take_picture:
-							attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
-							break;
-						case R.id.attach_choose_file:
-							attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
-							break;
-						case R.id.attach_record_voice:
-							attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
-							break;
-					}
-					return false;
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				switch (item.getItemId()) {
+					case R.id.attach_choose_picture:
+						attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
+						break;
+					case R.id.attach_take_picture:
+						attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
+						break;
+					case R.id.attach_choose_file:
+						attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
+						break;
+					case R.id.attach_record_voice:
+						attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
+						break;
 				}
-			});
+				return false;
+			}
+		});
 		attachFilePopup.show();
 	}
 
@@ -756,14 +742,20 @@ public class ConversationActivity extends XmppActivity
 	@Override
 	public void onResume() {
 		super.onResume();
-		int theme = findTheme();
-		if (this.mTheme != theme) {
+		final int theme = findTheme();
+		final boolean usingEnterKey = usingEnterKey();
+		if (this.mTheme != theme || usingEnterKey != mUsingEnterKey) {
 			recreate();
 		}
 		this.mActivityPaused = false;
 		if (this.xmppConnectionServiceBound) {
 			this.xmppConnectionService.getNotificationService().setIsInForeground(true);
 		}
+
+		if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
+			sendReadMarkerIfNecessary(getSelectedConversation());
+		}
+
 	}
 
 	@Override
@@ -790,11 +782,9 @@ public class ConversationActivity extends XmppActivity
 		} else if (conversationList.size() <= 0) {
 			startActivity(new Intent(this, StartConversationActivity.class));
 			finish();
-		} else if (getIntent() != null
-				&& VIEW_CONVERSATION.equals(getIntent().getType())) {
+		} else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) {
 			handleViewConversationIntent(getIntent());
-		} else if (mOpenConverstaion != null) {
-			selectConversationByUuid(mOpenConverstaion);
+		} else if (selectConversationByUuid(mOpenConverstaion)) {
 			if (mPanelOpen) {
 				showConversationsOverview();
 			} else {
@@ -825,30 +815,43 @@ public class ConversationActivity extends XmppActivity
 		setIntent(new Intent());
 	}
 
-	private void handleViewConversationIntent(Intent intent) {
-		String uuid = (String) intent.getExtras().get(CONVERSATION);
-		String text = intent.getExtras().getString(TEXT, "");
-		String nick = intent.getExtras().getString(NICK,null);
-		selectConversationByUuid(uuid);
-		this.mConversationFragment.reInit(getSelectedConversation());
-		if (nick!=null) {
-			this.mConversationFragment.highlightInConference(nick);
-		} else {
-			this.mConversationFragment.appendText(text);
-		}
-		hideConversationsOverview();
-		openConversation();
-		if (mContentView instanceof SlidingPaneLayout) {
-			updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet
+	private void handleViewConversationIntent(final Intent intent) {
+		final String uuid = (String) intent.getExtras().get(CONVERSATION);
+		final String downloadUuid = (String) intent.getExtras().get(MESSAGE);
+		final String text = intent.getExtras().getString(TEXT, "");
+		final String nick = intent.getExtras().getString(NICK, null);
+		if (selectConversationByUuid(uuid)) {
+			this.mConversationFragment.reInit(getSelectedConversation());
+			if (nick != null) {
+				this.mConversationFragment.highlightInConference(nick);
+			} else {
+				this.mConversationFragment.appendText(text);
+			}
+			hideConversationsOverview();
+			openConversation();
+			if (mContentView instanceof SlidingPaneLayout) {
+				updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet
+			}
+			if (downloadUuid != null) {
+				final Message message = mSelectedConversation.findMessageWithFileAndUuid(downloadUuid);
+				if (message != null) {
+					mConversationFragment.messageListAdapter.startDownloadable(message);
+				}
+			}
 		}
 	}
 
-	private void selectConversationByUuid(String uuid) {
+	private boolean selectConversationByUuid(String uuid) {
+		if (uuid == null) {
+			return false;
+		}
 		for (Conversation aConversationList : conversationList) {
 			if (aConversationList.getUuid().equals(uuid)) {
 				setSelectedConversation(aConversationList);
+				return true;
 			}
 		}
+		return false;
 	}
 
 	@Override
@@ -1050,10 +1053,10 @@ public class ConversationActivity extends XmppActivity
 
 	@Override
 	public void OnUpdateBlocklist(Status status) {
-		invalidateOptionsMenu();
 		runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
+				invalidateOptionsMenu();
 				ConversationActivity.this.mConversationFragment.updateMessages();
 			}
 		});
@@ -1063,7 +1066,7 @@ public class ConversationActivity extends XmppActivity
 		xmppConnectionService.sendUnblockRequest(conversation);
 	}
 
-	public void blockConversation(final Blockable conversation) {
-		xmppConnectionService.sendBlockRequest(conversation);
+	public boolean enterIsSend() {
+		return getPreferences().getBoolean("enter_is_send",false);
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 93a4cc7e..80ac9da1 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
+import android.text.InputType;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -33,6 +34,7 @@ import android.widget.Toast;
 
 import net.java.otr4j.session.SessionStatus;
 
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -296,6 +298,15 @@ public class ConversationFragment extends Fragment {
 				default:
 					break;
 			}
+			getActivity().invalidateOptionsMenu();
+		}
+	}
+
+	private void setupIme() {
+		if (((ConversationActivity)getActivity()).usingEnterKey()) {
+			mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
+		} else {
+			mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
 		}
 	}
 
@@ -305,6 +316,7 @@ public class ConversationFragment extends Fragment {
 		final View view = inflater.inflate(R.layout.fragment_conversation,
 				container, false);
 		mEditMessage = (EditMessage) view.findViewById(R.id.textinput);
+		setupIme();
 		mEditMessage.setOnClickListener(new OnClickListener() {
 
 			@Override
@@ -316,8 +328,13 @@ public class ConversationFragment extends Fragment {
 		mEditMessage.setOnEnterPressedListener(new OnEnterPressed() {
 
 			@Override
-			public void onEnterPressed() {
-				sendMessage();
+			public boolean onEnterPressed() {
+				if (activity.enterIsSend()) {
+					sendMessage();
+					return true;
+				} else {
+					return false;
+				}
 			}
 		});
 
@@ -346,14 +363,7 @@ public class ConversationFragment extends Fragment {
 							}
 						}
 					} else {
-						Contact contact = message.getConversation()
-							.getContact();
-						if (contact.showInRoster()) {
-							activity.switchToContactDetails(contact);
-						} else {
-							activity.showAddToRosterDialog(message
-									.getConversation());
-						}
+						activity.switchToContactDetails(message.getContact());
 					}
 				} else {
 					Account account = message.getConversation().getAccount();
@@ -403,7 +413,7 @@ public class ConversationFragment extends Fragment {
 			activity.getMenuInflater().inflate(R.menu.message_context, menu);
 			menu.setHeaderTitle(R.string.message_options);
 			MenuItem copyText = menu.findItem(R.id.copy_text);
-			MenuItem shareImage = menu.findItem(R.id.share_image);
+			MenuItem shareWith = menu.findItem(R.id.share_with);
 			MenuItem sendAgain = menu.findItem(R.id.send_again);
 			MenuItem copyUrl = menu.findItem(R.id.copy_url);
 			MenuItem downloadImage = menu.findItem(R.id.download_image);
@@ -411,33 +421,36 @@ public class ConversationFragment extends Fragment {
 			if (m.getType() != Message.TYPE_TEXT || m.getDownloadable() != null) {
 				copyText.setVisible(false);
 			}
-			if (m.getType() != Message.TYPE_IMAGE || m.getDownloadable() != null) {
-				shareImage.setVisible(false);
-			}
+			if (m.getType() == Message.TYPE_TEXT
+					|| m.getType() == Message.TYPE_PRIVATE
+					|| m.getDownloadable() != null) {
+				shareWith.setVisible(false);
+					}
 			if (m.getStatus() != Message.STATUS_SEND_FAILED) {
 				sendAgain.setVisible(false);
 			}
 			if ((m.getType() != Message.TYPE_IMAGE && m.getDownloadable() == null)
 					|| m.getImageParams().url == null) {
 				copyUrl.setVisible(false);
-			}
+					}
 			if (m.getType() != Message.TYPE_TEXT
 					|| m.getDownloadable() != null
 					|| !m.bodyContainsDownloadable()) {
 				downloadImage.setVisible(false);
-			}
+					}
 			if (!((m.getDownloadable() != null && !(m.getDownloadable() instanceof DownloadablePlaceholder))
-					|| (m.isFileOrImage() && m.getStatus() == Message.STATUS_WAITING))) {
+						|| (m.isFileOrImage() && (m.getStatus() == Message.STATUS_WAITING
+								|| m.getStatus() == Message.STATUS_OFFERED)))) {
 				cancelTransmission.setVisible(false);
-			}
+								}
 		}
 	}
 
 	@Override
 	public boolean onContextItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-			case R.id.share_image:
-				shareImage(selectedMessage);
+			case R.id.share_with:
+				shareWith(selectedMessage);
 				return true;
 			case R.id.copy_text:
 				copyText(selectedMessage);
@@ -459,16 +472,20 @@ public class ConversationFragment extends Fragment {
 		}
 	}
 
-	private void shareImage(Message message) {
+	private void shareWith(Message message) {
 		Intent shareIntent = new Intent();
 		shareIntent.setAction(Intent.ACTION_SEND);
 		shareIntent.putExtra(Intent.EXTRA_STREAM,
 				activity.xmppConnectionService.getFileBackend()
 				.getJingleFileUri(message));
 		shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-		shareIntent.setType("image/webp");
-		activity.startActivity(Intent.createChooser(shareIntent,
-					getText(R.string.share_with)));
+		String path = message.getRelativeFilePath();
+		String mime = path == null ? null :URLConnection.guessContentTypeFromName(path);
+		if (mime == null) {
+			mime = "image/webp";
+		}
+		shareIntent.setType(mime);
+		activity.startActivity(Intent.createChooser(shareIntent,getText(R.string.share_with)));
 	}
 
 	private void copyText(Message message) {
@@ -595,15 +612,6 @@ public class ConversationFragment extends Fragment {
 									}
 								}
 							});
-				} else if (this.conversation.isMuted()) {
-					showSnackbar(R.string.notifications_disabled, R.string.enable,
-							new OnClickListener() {
-
-								@Override
-								public void onClick(final View v) {
-									activity.unmuteConversation(conversation);
-								}
-							});
 				} else if (!contact.showInRoster()
 						&& contact
 						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
@@ -650,9 +658,18 @@ public class ConversationFragment extends Fragment {
 						default:
 							break;
 					}
-						}
+				} else if (this.conversation.isMuted()) {
+					showSnackbar(R.string.notifications_disabled, R.string.enable,
+							new OnClickListener() {
+
+								@Override
+								public void onClick(final View v) {
+									activity.unmuteConversation(conversation);
+								}
+							});
+				}
 				conversation.populateWithMessages(ConversationFragment.this.messageList);
-				for (Message message : this.messageList) {
+				for (final Message message : this.messageList) {
 					if (message.getEncryption() == Message.ENCRYPTION_PGP
 							&& (message.getStatus() == Message.STATUS_RECEIVED || message
 								.getStatus() >= Message.STATUS_SEND)
@@ -951,7 +968,4 @@ public class ConversationFragment extends Fragment {
 		this.mEditMessage.append(text);
 	}
 
-	public void clearInputField() {
-		this.mEditMessage.setText("");
-	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index f8302050..5090bbf5 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -21,9 +21,12 @@ public class EditMessage extends EditText {
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if (keyCode == KeyEvent.KEYCODE_ENTER) {
 			if (mOnEnterPressed != null) {
-				mOnEnterPressed.onEnterPressed();
+				if (mOnEnterPressed.onEnterPressed()) {
+					return true;
+				} else {
+					return super.onKeyDown(keyCode, event);
+				}
 			}
-			return true;
 		}
 		return super.onKeyDown(keyCode, event);
 	}
@@ -33,7 +36,7 @@ public class EditMessage extends EditText {
 	}
 
 	public interface OnEnterPressed {
-		public void onEnterPressed();
+		public boolean onEnterPressed();
 	}
 
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 10ee0cd5..2ba0b090 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -11,6 +11,8 @@ import android.view.View.OnLongClickListener;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.utils.PhoneHelper;
@@ -31,13 +33,18 @@ public class PublishProfilePictureActivity extends XmppActivity {
 
 	private Uri avatarUri;
 	private Uri defaultUri;
+	private OnLongClickListener backToDefaultListener = new OnLongClickListener() {
 
+		@Override
+		public boolean onLongClick(View v) {
+			avatarUri = defaultUri;
+			loadImageIntoPreview(defaultUri);
+			return true;
+		}
+	};
 	private Account account;
-
 	private boolean support = false;
-
 	private boolean mInitialAccountSetup;
-
 	private UiCallback<Avatar> avatarPublication = new UiCallback<Avatar>() {
 
 		@Override
@@ -50,6 +57,9 @@ public class PublishProfilePictureActivity extends XmppActivity {
 						startActivity(new Intent(getApplicationContext(),
 								StartConversationActivity.class));
 					}
+					Toast.makeText(PublishProfilePictureActivity.this,
+							R.string.avatar_has_been_published,
+							Toast.LENGTH_SHORT).show();
 					finish();
 				}
 			});
@@ -75,16 +85,6 @@ public class PublishProfilePictureActivity extends XmppActivity {
 		}
 	};
 
-	private OnLongClickListener backToDefaultListener = new OnLongClickListener() {
-
-		@Override
-		public boolean onLongClick(View v) {
-			avatarUri = defaultUri;
-			loadImageIntoPreview(defaultUri);
-			return true;
-		}
-	};
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 352652de..136108ef 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -75,6 +75,15 @@ public class SettingsActivity extends XmppActivity implements
             case "keep_foreground_service":
                 xmppConnectionService.toggleForegroundService();
                 break;
+			case "confirm_messages":
+				if (xmppConnectionServiceBound) {
+					for (Account account : xmppConnectionService.getAccounts()) {
+						if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+							xmppConnectionService.sendPresence(account);
+						}
+					}
+				}
+				break;
         }
         Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 5e770376..6be238dc 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -134,14 +134,10 @@ public class ShareWithActivity extends XmppActivity {
 	@Override
 	public void onStart() {
 		final String type = getIntent().getType();
-		if (type != null && !type.startsWith("text/")) {
-			this.share.uri = (Uri) getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
-			try {
-				this.share.image = type.startsWith("image/")
-						|| URLConnection.guessContentTypeFromName(this.share.uri.toString()).startsWith("image/");
-			} catch (final StringIndexOutOfBoundsException ignored) {
-				this.share.image = false;
-			}
+		final Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+		if (type != null && uri != null && !type.equalsIgnoreCase("text/plain")) {
+			this.share.uri = uri;
+			this.share.image = type.startsWith("image/") || isImage(uri);
 		} else {
 			this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
 		}
@@ -151,6 +147,15 @@ public class ShareWithActivity extends XmppActivity {
 		super.onStart();
 	}
 
+	protected boolean isImage(Uri uri) {
+		try {
+			String guess = URLConnection.guessContentTypeFromName(uri.toString());
+			return (guess != null && guess.startsWith("image/"));
+		} catch (final StringIndexOutOfBoundsException ignored) {
+			return false;
+		}
+	}
+
 	@Override
 	void onBackendConnected() {
 		if (xmppConnectionServiceBound && share != null
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 209c0a7b..ff46ffd8 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -59,6 +59,7 @@ import eu.siacs.conversations.entities.Bookmark;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.ListItem;
+import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
 import eu.siacs.conversations.ui.adapter.KnownHostsAdapter;
 import eu.siacs.conversations.ui.adapter.ListItemAdapter;
@@ -114,6 +115,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			return true;
 		}
 	};
+	private boolean mHideOfflineContacts = false;
 	private TabListener mTabListener = new TabListener() {
 
 		@Override
@@ -159,7 +161,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		}
 	};
 	private MenuItem mMenuSearchView;
-	private String mInitialJid;
 	private ListItemAdapter.OnTagClickedListener mOnTagClickedListener = new ListItemAdapter.OnTagClickedListener() {
 		@Override
 		public void onTagClicked(String tag) {
@@ -171,6 +172,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			}
 		}
 	};
+	private String mInitialJid;
 
 	@Override
 	public void onRosterUpdate() {
@@ -245,6 +247,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				}
 			});
 
+		this.mHideOfflineContacts = getPreferences().getBoolean("hide_offline", false);
+
 	}
 
 	protected void openConversationForContact(int position) {
@@ -448,8 +452,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 							if (account.hasBookmarkFor(conferenceJid)) {
 								jid.setError(getString(R.string.bookmark_already_exists));
 							} else {
-								final Bookmark bookmark = new Bookmark(account,
-										conferenceJid);
+								final Bookmark bookmark = new Bookmark(account,conferenceJid.toBareJid());
 								bookmark.setAutojoin(true);
 								account.getBookmarks().add(bookmark);
 								xmppConnectionService
@@ -497,10 +500,10 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	public boolean onCreateOptionsMenu(Menu menu) {
 		this.mOptionsMenu = menu;
 		getMenuInflater().inflate(R.menu.start_conversation, menu);
-		MenuItem menuCreateContact = menu
-			.findItem(R.id.action_create_contact);
-		MenuItem menuCreateConference = menu
-			.findItem(R.id.action_join_conference);
+		MenuItem menuCreateContact = menu.findItem(R.id.action_create_contact);
+		MenuItem menuCreateConference = menu.findItem(R.id.action_join_conference);
+		MenuItem menuHideOffline = menu.findItem(R.id.action_hide_offline);
+		menuHideOffline.setChecked(this.mHideOfflineContacts);
 		mMenuSearchView = menu.findItem(R.id.action_search);
 		mMenuSearchView.setOnActionExpandListener(mOnActionExpandListener);
 		View mSearchView = mMenuSearchView.getActionView();
@@ -532,6 +535,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			case R.id.action_scan_qr_code:
 				new IntentIntegrator(this).initiateScan();
 				return true;
+			case R.id.action_hide_offline:
+				mHideOfflineContacts = !item.isChecked();
+				getPreferences().edit().putBoolean("hide_offline", mHideOfflineContacts).commit();
+				if (mSearchEditText != null) {
+					filter(mSearchEditText.getText().toString());
+				}
+				invalidateOptionsMenu();
 		}
 		return super.onOptionsItemSelected(item);
 	}
@@ -668,7 +678,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		for (Account account : xmppConnectionService.getAccounts()) {
 			if (account.getStatus() != Account.State.DISABLED) {
 				for (Contact contact : account.getRoster().getContacts()) {
-					if (contact.showInRoster() && contact.match(needle)) {
+					if (contact.showInRoster() && contact.match(needle)
+							&& (!this.mHideOfflineContacts
+							|| contact.getPresences().getMostAvailableStatus() < Presences.OFFLINE)) {
 						this.contacts.add(contact);
 					}
 				}
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 535aa6a5..1f1af09c 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.ui;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -97,6 +98,7 @@ public abstract class XmppActivity extends Activity {
 
 	private DisplayMetrics metrics;
 	protected int mTheme;
+	protected boolean mUsingEnterKey = false;
 
 	protected interface OnValueEdited {
 		public void onValueEdited(String value);
@@ -300,13 +302,23 @@ public abstract class XmppActivity extends Activity {
 		mColorOrange = getResources().getColor(R.color.orange);
 		mColorGreen = getResources().getColor(R.color.green);
 		mPrimaryColor = getResources().getColor(R.color.primary);
-		mSecondaryBackgroundColor = getResources().getColor(
-				R.color.secondarybackground);
+		mSecondaryBackgroundColor = getResources().getColor(R.color.secondarybackground);
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
+		this.mUsingEnterKey = usingEnterKey();
 		mUseSubject = getPreferences().getBoolean("use_subject", true);
+		
         Settings.initSettingsClassWithPreferences(getPreferences());
-    }
+		
+		final ActionBar ab = getActionBar();
+		if (ab!=null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+	}
+
+	protected boolean usingEnterKey() {
+		return getPreferences().getBoolean("display_enter_key", false);
+	}
 
 	protected SharedPreferences getPreferences() {
 		return PreferenceManager
@@ -394,9 +406,7 @@ public abstract class XmppActivity extends Activity {
 					public void success(Account account) {
 						xmppConnectionService.databaseBackend
 							.updateAccount(account);
-						xmppConnectionService.sendPresencePacket(account,
-								xmppConnectionService.getPresenceGenerator()
-								.sendPresence(account));
+						xmppConnectionService.sendPresence(account);
 						if (conversation != null) {
 							conversation
 								.setNextEncryption(Message.ENCRYPTION_PGP);
@@ -430,9 +440,12 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void showAddToRosterDialog(final Conversation conversation) {
-		final Jid jid = conversation.getJid();
+		showAddToRosterDialog(conversation.getContact());
+	}
+
+	protected void showAddToRosterDialog(final Contact contact) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(jid.toString());
+		builder.setTitle(contact.getJid().toString());
 		builder.setMessage(getString(R.string.not_in_roster));
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.add_contact),
@@ -440,11 +453,10 @@ public abstract class XmppActivity extends Activity {
 
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
-						final Jid jid = conversation.getJid();
-						Account account = conversation.getAccount();
+						final Jid jid = contact.getJid();
+						Account account = contact.getAccount();
 						Contact contact = account.getRoster().getContact(jid);
 						xmppConnectionService.createContact(contact);
-						switchToContactDetails(contact);
 					}
 				});
 		builder.create().show();
@@ -677,6 +689,10 @@ public abstract class XmppActivity extends Activity {
 		return this.mPrimaryColor;
 	}
 
+	public int getOnlineColor() {
+		return this.mColorGreen;
+	}
+	
 	public int getSecondaryBackgroundColor() {
 		return this.mSecondaryBackgroundColor;
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 139f3657..29730914 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -39,7 +39,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         statusView.setText(getContext().getString(account.getStatus().getReadableId()));
         switch (account.getStatus()) {
             case ONLINE:
-                statusView.setTextColor(activity.getPrimaryColor());
+                statusView.setTextColor(activity.getOnlineColor());
                 break;
             case DISABLED:
             case CONNECTING:
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 22f6b662..e62aaf96 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -1,5 +1,16 @@
 package eu.siacs.conversations.ui.adapter;
 
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import java.util.List;
 
 import de.tzur.conversations.Settings;
@@ -38,10 +49,8 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 	@Override
 	public View getView(int position, View view, ViewGroup parent) {
 		if (view == null) {
-			LayoutInflater inflater = (LayoutInflater) activity
-				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			view = inflater.inflate(R.layout.conversation_list_row,
-					parent, false);
+			LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			view = inflater.inflate(R.layout.conversation_list_row,parent, false);
 		}
 		Conversation conversation = getItem(position);
 		if (this.activity instanceof ConversationActivity) {
@@ -57,20 +66,15 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 				view.setBackgroundColor(Color.TRANSPARENT);
 			}
 		}
-		TextView convName = (TextView) view
-			.findViewById(R.id.conversation_name);
-		if (conversation.getMode() == Conversation.MODE_SINGLE
-				|| activity.useSubjectToIdentifyConference()) {
+		TextView convName = (TextView) view.findViewById(R.id.conversation_name);
+		if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
 			convName.setText(conversation.getName());
 		} else {
 			convName.setText(conversation.getJid().toBareJid().toString());
 		}
-		TextView mLastMessage = (TextView) view
-			.findViewById(R.id.conversation_lastmsg);
-		TextView mTimestamp = (TextView) view
-			.findViewById(R.id.conversation_lastupdate);
-		ImageView imagePreview = (ImageView) view
-			.findViewById(R.id.conversation_lastimage);
+		TextView mLastMessage = (TextView) view.findViewById(R.id.conversation_lastmsg);
+		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
+		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
 
         if (Settings.SHOW_ONLINE_STATUS) {
             TextView status = (TextView) view.findViewById(R.id.status);
@@ -100,91 +104,35 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			convName.setTypeface(null, Typeface.NORMAL);
 		}
 
-		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE
-				|| message.getDownloadable() != null) {
-			Downloadable d = message.getDownloadable();
-			if (conversation.isRead()) {
-				mLastMessage.setTypeface(null, Typeface.ITALIC);
-			} else {
-				mLastMessage.setTypeface(null, Typeface.BOLD_ITALIC);
-			}
-			if (d != null) {
-				mLastMessage.setVisibility(View.VISIBLE);
-				imagePreview.setVisibility(View.GONE);
-				if (d.getStatus() == Downloadable.STATUS_CHECKING) {
-					mLastMessage.setText(R.string.checking_image);
-				} else if (d.getStatus() == Downloadable.STATUS_DOWNLOADING) {
-					if (message.getType() == Message.TYPE_FILE) {
-						mLastMessage.setText(getContext().getString(R.string.receiving_file,d.getMimeType(), d.getProgress()));
-					} else {
-						mLastMessage.setText(getContext().getString(R.string.receiving_image, d.getProgress()));
-					}
-				} else if (d.getStatus() == Downloadable.STATUS_OFFER) {
-					if (message.getType() == Message.TYPE_FILE) {
-						mLastMessage.setText(R.string.file_offered_for_download);
-					} else {
-						mLastMessage.setText(R.string.image_offered_for_download);
-					}
-				} else if (d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
-					mLastMessage.setText(R.string.image_offered_for_download);
-				} else if (d.getStatus() == Downloadable.STATUS_DELETED) {
-					if (message.getType() == Message.TYPE_FILE) {
-						mLastMessage.setText(R.string.file_deleted);
-					} else {
-						mLastMessage.setText(R.string.image_file_deleted);
-					}
-				} else if (d.getStatus() == Downloadable.STATUS_FAILED) {
-					if (message.getType() == Message.TYPE_FILE) {
-						mLastMessage.setText(R.string.file_transmission_failed);
-					} else {
-						mLastMessage.setText(R.string.image_transmission_failed);
-					}
-				} else if (message.getImageParams().width > 0) {
-					mLastMessage.setVisibility(View.GONE);
-					imagePreview.setVisibility(View.VISIBLE);
-					activity.loadBitmap(message, imagePreview);
+		if (message.getImageParams().width > 0
+				&& (message.getDownloadable() == null
+				|| message.getDownloadable().getStatus() != Downloadable.STATUS_DELETED)) {
+			mLastMessage.setVisibility(View.GONE);
+			imagePreview.setVisibility(View.VISIBLE);
+			activity.loadBitmap(message, imagePreview);
+		} else {
+			Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message);
+			mLastMessage.setVisibility(View.VISIBLE);
+			imagePreview.setVisibility(View.GONE);
+			mLastMessage.setText(preview.first);
+			if (preview.second) {
+				if (conversation.isRead()) {
+					mLastMessage.setTypeface(null, Typeface.ITALIC);
 				} else {
-					mLastMessage.setText("");
+					mLastMessage.setTypeface(null,Typeface.BOLD_ITALIC);
 				}
-			} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-				imagePreview.setVisibility(View.GONE);
-				mLastMessage.setVisibility(View.VISIBLE);
-				mLastMessage.setText(R.string.encrypted_message_received);
-			} else if (message.getType() == Message.TYPE_FILE && message.getImageParams().width <= 0) {
-				DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
-				mLastMessage.setVisibility(View.VISIBLE);
-				imagePreview.setVisibility(View.GONE);
-				mLastMessage.setText(getContext().getString(R.string.file,file.getMimeType()));
-			} else {
-				mLastMessage.setVisibility(View.GONE);
-				imagePreview.setVisibility(View.VISIBLE);
-				activity.loadBitmap(message, imagePreview);
-			}
-		} else {
-			if ((message.getEncryption() != Message.ENCRYPTION_PGP)
-					&& (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) {
-                boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-                mLastMessage.setText(parseEmoticons ? UIHelper
-						.transformAsciiEmoticons(getContext(), message.getBody()) : message
-						.getBody());
 			} else {
-				mLastMessage.setText(R.string.encrypted_message_received);
-			}
-			if (!conversation.isRead()) {
-				mLastMessage.setTypeface(null, Typeface.BOLD);
-			} else {
-				mLastMessage.setTypeface(null, Typeface.NORMAL);
+				if (conversation.isRead()) {
+					mLastMessage.setTypeface(null,Typeface.NORMAL);
+				} else {
+					mLastMessage.setTypeface(null,Typeface.BOLD);
+				}
 			}
-			mLastMessage.setVisibility(View.VISIBLE);
-			imagePreview.setVisibility(View.GONE);
 		}
-		mTimestamp.setText(UIHelper.readableTimeDifference(getContext(),
-					conversation.getLatestMessage().getTimeSent()));
 
-		ImageView profilePicture = (ImageView) view
-			.findViewById(R.id.conversation_image);
-		profilePicture.setImageBitmap(activity.avatarService().get(
-					conversation, activity.getPixel(56)));
+		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
+		ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
+		profilePicture.setImageBitmap(activity.avatarService().get(conversation, activity.getPixel(56)));
 
 		return view;
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 2771c4de..7fa05050 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -11,6 +11,7 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
@@ -36,7 +37,6 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.Message.ImageParams;
 import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class MessageAdapter extends ArrayAdapter<Message> {
 
@@ -53,14 +53,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
 
 	private OnLongClickListener openContextMenu = new OnLongClickListener() {
-		
+
 		@Override
 		public boolean onLongClick(View v) {
 			v.showContextMenu();
 			return true;
 		}
 	};
-	
+
 	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
 		this.activity = activity;
@@ -74,7 +74,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	public void setOnContactPictureLongClicked(
 			OnContactPictureLongClicked listener) {
 		this.mOnContactPictureLongClickedListener = listener;
-	}
+			}
 
 	@Override
 	public int getViewTypeCount() {
@@ -102,57 +102,52 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			viewHolder.indicatorReceived.setVisibility(View.GONE);
 		}
 		boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI
-				&& message.getMergedStatus() <= Message.STATUS_RECEIVED;
+			&& message.getMergedStatus() <= Message.STATUS_RECEIVED;
 		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getDownloadable() != null) {
 			ImageParams params = message.getImageParams();
 			if (params.size > (1.5 * 1024 * 1024)) {
-				filesize = params.size / (1024 * 1024)+ " MB";
+				filesize = params.size / (1024 * 1024)+ " MiB";
 			} else if (params.size > 0) {
-				filesize = params.size / 1024 + " KB";
+				filesize = params.size / 1024 + " KiB";
 			}
 			if (message.getDownloadable() != null && message.getDownloadable().getStatus() == Downloadable.STATUS_FAILED) {
 				error = true;
 			}
 		}
 		switch (message.getMergedStatus()) {
-		case Message.STATUS_WAITING:
-			info = getContext().getString(R.string.waiting);
-			break;
-		case Message.STATUS_UNSEND:
-			Downloadable d = message.getDownloadable();
-			if (d!=null) {
-				info = getContext().getString(R.string.sending_file,d.getProgress());
-			} else {
-				info = getContext().getString(R.string.sending);
-			}
-			break;
-		case Message.STATUS_OFFERED:
-			info = getContext().getString(R.string.offering);
-			break;
-		case Message.STATUS_SEND_RECEIVED:
-			if (activity.indicateReceived()) {
-				viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
-			}
-			break;
-		case Message.STATUS_SEND_DISPLAYED:
-			if (activity.indicateReceived()) {
-				viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
-			}
-			break;
-		case Message.STATUS_SEND_FAILED:
-			info = getContext().getString(R.string.send_failed);
-			error = true;
-			break;
-		default:
-			if (multiReceived) {
-				Contact contact = message.getContact();
-				if (contact != null) {
-					info = contact.getDisplayName();
+			case Message.STATUS_WAITING:
+				info = getContext().getString(R.string.waiting);
+				break;
+			case Message.STATUS_UNSEND:
+				Downloadable d = message.getDownloadable();
+				if (d!=null) {
+					info = getContext().getString(R.string.sending_file,d.getProgress());
 				} else {
-					info = getDisplayedMucCounterpart(message.getCounterpart());
+					info = getContext().getString(R.string.sending);
 				}
-			}
-			break;
+				break;
+			case Message.STATUS_OFFERED:
+				info = getContext().getString(R.string.offering);
+				break;
+			case Message.STATUS_SEND_RECEIVED:
+				if (activity.indicateReceived()) {
+					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
+				}
+				break;
+			case Message.STATUS_SEND_DISPLAYED:
+				if (activity.indicateReceived()) {
+					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
+				}
+				break;
+			case Message.STATUS_SEND_FAILED:
+				info = getContext().getString(R.string.send_failed);
+				error = true;
+				break;
+			default:
+				if (multiReceived) {
+					info = UIHelper.getMessageDisplayName(message);
+				}
+				break;
 		}
 		if (error) {
 			viewHolder.time.setTextColor(activity.getWarningTextColor());
@@ -213,29 +208,40 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.image.setVisibility(View.GONE);
 		viewHolder.messageBody.setVisibility(View.VISIBLE);
 		viewHolder.messageBody.setText(getContext().getString(
-				R.string.decryption_failed));
+					R.string.decryption_failed));
 		viewHolder.messageBody.setTextColor(activity.getWarningTextColor());
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
 		viewHolder.messageBody.setTextIsSelectable(false);
 	}
 
-	private void displayTextMessage(ViewHolder viewHolder, Message message) {
+	private void displayTextMessage(final ViewHolder viewHolder, final Message message) {
 		if (viewHolder.download_button != null) {
 			viewHolder.download_button.setVisibility(View.GONE);
 		}
 		viewHolder.image.setVisibility(View.GONE);
 		viewHolder.messageBody.setVisibility(View.VISIBLE);
 		if (message.getBody() != null) {
+			final String nick = UIHelper.getMessageDisplayName(message);
+			final String formattedBody = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,
+					nick + " ");
 			if (message.getType() != Message.TYPE_PRIVATE) {
                 boolean parseEmoticons = Settings.PARSE_EMOTICONS;
                 viewHolder.messageBody.setText(parseEmoticons ? UIHelper
 						.transformAsciiEmoticons(getContext(), message.getMergedBody())
 						: message.getMergedBody());
+				if (message.hasMeCommand()) {
+					final Spannable span = new SpannableString(formattedBody);
+					span.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), 0, nick.length(),
+							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					viewHolder.messageBody.setText(span);
+				} else {
+					viewHolder.messageBody.setText(message.getMergedBody());
+				}
 			} else {
 				String privateMarker;
 				if (message.getStatus() <= Message.STATUS_RECEIVED) {
 					privateMarker = activity
-							.getString(R.string.private_message);
+						.getString(R.string.private_message);
 				} else {
 					final String to;
 					if (message.getCounterpart() != null) {
@@ -245,15 +251,19 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					}
 					privateMarker = activity.getString(R.string.private_message_to, to);
 				}
-				SpannableString span = new SpannableString(privateMarker + " "
-						+ message.getBody());
-				span.setSpan(
-						new ForegroundColorSpan(activity
-								.getSecondaryTextColor()), 0, privateMarker
-								.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				span.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0,
+				final Spannable span = new SpannableString(privateMarker + " "
+						+ formattedBody);
+				span.setSpan(new ForegroundColorSpan(activity
+							.getSecondaryTextColor()), 0, privateMarker
+						.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				span.setSpan(new StyleSpan(Typeface.BOLD), 0,
 						privateMarker.length(),
 						Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				if (message.hasMeCommand()) {
+					span.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), privateMarker.length() + 1,
+							privateMarker.length() + 1 + nick.length(),
+							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				}
 				viewHolder.messageBody.setText(span);
 			}
 		} else {
@@ -281,16 +291,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	}
 
 	private void displayOpenableMessage(ViewHolder viewHolder,final Message message) {
-		final DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
 		viewHolder.image.setVisibility(View.GONE);
 		viewHolder.messageBody.setVisibility(View.GONE);
 		viewHolder.download_button.setVisibility(View.VISIBLE);
-		viewHolder.download_button.setText(activity.getString(R.string.open_file,file.getMimeType()));
+		viewHolder.download_button.setText(activity.getString(R.string.open_x_file, UIHelper.getFileDescriptionString(activity,message)));
 		viewHolder.download_button.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View v) {
-				openDownloadable(file);
+				openDownloadable(message);
 			}
 		});
 		viewHolder.download_button.setOnLongClickListener(openContextMenu);
@@ -315,7 +324,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			scalledH = (int) (params.height / ((double) params.width / target));
 		}
 		viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams(
-				scalledW, scalledH));
+					scalledW, scalledH));
 		activity.loadBitmap(message, viewHolder.image);
 		viewHolder.image.setOnClickListener(new OnClickListener() {
 
@@ -330,16 +339,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
-	private String getDisplayedMucCounterpart(final Jid counterpart) {
-		if (counterpart==null) {
-			return "";
-		} else if (!counterpart.isBareJid()) {
-			return counterpart.getResourcepart();
-		} else {
-			return counterpart.toString();
-		}
-	}
-
 	@Override
 	public View getView(int position, View view, ViewGroup parent) {
 		final Message message = getItem(position);
@@ -350,59 +349,58 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (view == null) {
 			viewHolder = new ViewHolder();
 			switch (type) {
-			case NULL:
-				view = activity.getLayoutInflater().inflate(
-						R.layout.message_null, parent, false);
-				break;
-			case SENT:
-				view = activity.getLayoutInflater().inflate(
-						R.layout.message_sent, parent, false);
-				viewHolder.message_box = (LinearLayout) view
+				case NULL:
+					view = activity.getLayoutInflater().inflate(
+							R.layout.message_null, parent, false);
+					break;
+				case SENT:
+					view = activity.getLayoutInflater().inflate(
+							R.layout.message_sent, parent, false);
+					viewHolder.message_box = (LinearLayout) view
 						.findViewById(R.id.message_box);
-				viewHolder.contact_picture = (ImageView) view
+					viewHolder.contact_picture = (ImageView) view
 						.findViewById(R.id.message_photo);
-				viewHolder.download_button = (Button) view
+					viewHolder.download_button = (Button) view
 						.findViewById(R.id.download_button);
-				viewHolder.indicator = (ImageView) view
+					viewHolder.indicator = (ImageView) view
 						.findViewById(R.id.security_indicator);
-				viewHolder.image = (ImageView) view
+					viewHolder.image = (ImageView) view
 						.findViewById(R.id.message_image);
-				viewHolder.messageBody = (TextView) view
+					viewHolder.messageBody = (TextView) view
 						.findViewById(R.id.message_body);
-				viewHolder.time = (TextView) view
+					viewHolder.time = (TextView) view
 						.findViewById(R.id.message_time);
-				viewHolder.indicatorReceived = (ImageView) view
+					viewHolder.indicatorReceived = (ImageView) view
 						.findViewById(R.id.indicator_received);
-				break;
-			case RECEIVED:
-				view = activity.getLayoutInflater().inflate(
-						R.layout.message_received, parent, false);
-				viewHolder.message_box = (LinearLayout) view
+					break;
+				case RECEIVED:
+					view = activity.getLayoutInflater().inflate(
+							R.layout.message_received, parent, false);
+					viewHolder.message_box = (LinearLayout) view
 						.findViewById(R.id.message_box);
-				viewHolder.contact_picture = (ImageView) view
+					viewHolder.contact_picture = (ImageView) view
 						.findViewById(R.id.message_photo);
-				viewHolder.download_button = (Button) view
+					viewHolder.download_button = (Button) view
 						.findViewById(R.id.download_button);
-				viewHolder.indicator = (ImageView) view
+					viewHolder.indicator = (ImageView) view
 						.findViewById(R.id.security_indicator);
-				viewHolder.image = (ImageView) view
+					viewHolder.image = (ImageView) view
 						.findViewById(R.id.message_image);
-				viewHolder.messageBody = (TextView) view
+					viewHolder.messageBody = (TextView) view
 						.findViewById(R.id.message_body);
-				viewHolder.time = (TextView) view
+					viewHolder.time = (TextView) view
 						.findViewById(R.id.message_time);
-				viewHolder.indicatorReceived = (ImageView) view
+					viewHolder.indicatorReceived = (ImageView) view
 						.findViewById(R.id.indicator_received);
-				break;
-			case STATUS:
-				view = activity.getLayoutInflater().inflate(
-						R.layout.message_status, parent, false);
-				viewHolder.contact_picture = (ImageView) view
-						.findViewById(R.id.message_photo);
-				break;
-			default:
-				viewHolder = null;
-				break;
+					break;
+				case STATUS:
+					view = activity.getLayoutInflater().inflate(R.layout.message_status, parent, false);
+					viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
+					viewHolder.status_message = (TextView) view.findViewById(R.id.status_message);
+					break;
+				default:
+					viewHolder = null;
+					break;
 			}
 			view.setTag(viewHolder);
 		} else {
@@ -416,26 +414,19 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				viewHolder.contact_picture.setImageBitmap(activity
 						.avatarService().get(conversation.getContact(),
-								activity.getPixel(32)));
+							activity.getPixel(32)));
 				viewHolder.contact_picture.setAlpha(0.5f);
-				viewHolder.contact_picture
-						.setOnClickListener(new OnClickListener() {
-
-							@Override
-							public void onClick(View v) {
-								String name = conversation.getName();
-								String read = getContext()
-										.getString(
-												R.string.contact_has_read_up_to_this_point,
-												name);
-								Toast.makeText(getContext(), read,
-										Toast.LENGTH_SHORT).show();
-							}
-						});
+				viewHolder.status_message.setText(
+						activity.getString(R.string.contact_has_read_up_to_this_point, conversation.getName()));
 
 			}
 			return view;
 		} else if (type == NULL) {
+			if (viewHolder.message_box != null) {
+				Log.e(Config.LOGTAG, "detected type=NULL but with wrong cached view");
+				view = activity.getLayoutInflater().inflate(R.layout.message_null, parent, false);
+				view.setTag(new ViewHolder());
+			}
 			if (position == getCount() - 1) {
 				view.getLayoutParams().height = 1;
 			} else {
@@ -444,6 +435,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			}
 			view.setLayoutParams(view.getLayoutParams());
 			return view;
+		} else if (message.wasMergedIntoPrevious()) {
+			Log.e(Config.LOGTAG,"detected wasMergedIntoPrevious with wrong type");
+			return view;
 		} else if (viewHolder.messageBody == null || viewHolder.image == null) {
 			return view; //avoiding weird platform bugs
 		} else if (type == RECEIVED) {
@@ -451,70 +445,49 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			if (contact != null) {
 				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48)));
 			} else if (conversation.getMode() == Conversation.MODE_MULTI) {
-				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(getDisplayedMucCounterpart(message.getCounterpart()),
-                        activity.getPixel(48)));
+				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(
+						UIHelper.getMessageDisplayName(message),
+						activity.getPixel(48)));
 			}
 		} else if (type == SENT) {
 			viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(account, activity.getPixel(48)));
 		}
 
 		viewHolder.contact_picture
-				.setOnClickListener(new OnClickListener() {
+			.setOnClickListener(new OnClickListener() {
 
-					@Override
-					public void onClick(View v) {
-						if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
-							MessageAdapter.this.mOnContactPictureClickedListener
-									.onContactPictureClicked(message);
-						}
-
-					}
-				});
-		viewHolder.contact_picture
-				.setOnLongClickListener(new OnLongClickListener() {
-
-					@Override
-					public boolean onLongClick(View v) {
-						if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
-							MessageAdapter.this.mOnContactPictureLongClickedListener
-									.onContactPictureLongClicked(message);
-							return true;
-						} else {
-							return false;
-						}
+				@Override
+				public void onClick(View v) {
+					if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
+						MessageAdapter.this.mOnContactPictureClickedListener
+							.onContactPictureClicked(message);
 					}
-				});
 
-		if (message.getDownloadable() != null && message.getDownloadable().getStatus() != Downloadable.STATUS_UPLOADING) {
-			Downloadable d = message.getDownloadable();
-			if (d.getStatus() == Downloadable.STATUS_DOWNLOADING) {
-				if (message.getType() == Message.TYPE_FILE) {
-					displayInfoMessage(viewHolder,activity.getString(R.string.receiving_file,d.getMimeType(),d.getProgress()));
-				} else {
-					displayInfoMessage(viewHolder,activity.getString(R.string.receiving_image,d.getProgress()));
 				}
-			} else if (d.getStatus() == Downloadable.STATUS_CHECKING) {
-				displayInfoMessage(viewHolder,activity.getString(R.string.checking_image));
-			} else if (d.getStatus() == Downloadable.STATUS_DELETED) {
-				if (message.getType() == Message.TYPE_FILE) {
-					displayInfoMessage(viewHolder, activity.getString(R.string.file_deleted));
-				} else {
-					displayInfoMessage(viewHolder, activity.getString(R.string.image_file_deleted));
-				}
-			} else if (d.getStatus() == Downloadable.STATUS_OFFER) {
-				if (message.getType() == Message.TYPE_FILE) {
-					displayDownloadableMessage(viewHolder,message,activity.getString(R.string.download_file,d.getMimeType()));
-				} else {
-					displayDownloadableMessage(viewHolder, message,activity.getString(R.string.download_image));
-				}
-			} else if (d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
-				displayDownloadableMessage(viewHolder, message,activity.getString(R.string.check_image_filesize));
-			} else if (d.getStatus() == Downloadable.STATUS_FAILED) {
-				if (message.getType() == Message.TYPE_FILE) {
-					displayInfoMessage(viewHolder, activity.getString(R.string.file_transmission_failed));
-				} else {
-					displayInfoMessage(viewHolder, activity.getString(R.string.image_transmission_failed));
+			});
+		viewHolder.contact_picture
+			.setOnLongClickListener(new OnLongClickListener() {
+
+				@Override
+				public boolean onLongClick(View v) {
+					if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
+						MessageAdapter.this.mOnContactPictureLongClickedListener
+							.onContactPictureLongClicked(message);
+						return true;
+					} else {
+						return false;
+					}
 				}
+			});
+
+		final Downloadable downloadable = message.getDownloadable();
+		if (downloadable != null && downloadable.getStatus() != Downloadable.STATUS_UPLOADING) {
+			if (downloadable.getStatus() == Downloadable.STATUS_OFFER) {
+				displayDownloadableMessage(viewHolder,message,activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, message)));
+			} else if (downloadable.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
+				displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_image_filesize));
+			} else {
+				displayInfoMessage(viewHolder, UIHelper.getMessagePreview(activity, message).first);
 			}
 		} else if (message.getType() == Message.TYPE_IMAGE && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) {
 			displayImageMessage(viewHolder, message);
@@ -532,13 +505,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 						activity.getString(R.string.install_openkeychain));
 				if (viewHolder != null) {
 					viewHolder.message_box
-							.setOnClickListener(new OnClickListener() {
+						.setOnClickListener(new OnClickListener() {
 
-								@Override
-								public void onClick(View v) {
-									activity.showInstallPgpDialog();
-								}
-							});
+							@Override
+							public void onClick(View v) {
+								activity.showInstallPgpDialog();
+							}
+						});
 				}
 			}
 		} else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
@@ -562,7 +535,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 	}
 
-	public void openDownloadable(DownloadableFile file) {
+	public void openDownloadable(Message message) {
+		DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
 		if (!file.exists()) {
 			Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
 			return;
@@ -596,6 +570,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		protected TextView time;
 		protected TextView messageBody;
 		protected ImageView contact_picture;
-
+		protected TextView status_message;
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index 7a36e2ba..fc21acbc 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -2,12 +2,17 @@ package eu.siacs.conversations.utils;
 
 import java.security.SecureRandom;
 import java.text.Normalizer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 
-public class CryptoHelper {
+import eu.siacs.conversations.Config;
+
+public final class CryptoHelper {
 	public static final String FILETRANSFER = "?FILETRANSFERv1:";
-	final protected static char[] hexArray = "0123456789abcdef".toCharArray();
-	final protected static char[] vowels = "aeiou".toCharArray();
-	final protected static char[] consonants = "bcdfghjklmnpqrstvwxyz".toCharArray();
+	private final static char[] hexArray = "0123456789abcdef".toCharArray();
+	private final static char[] vowels = "aeiou".toCharArray();
+	private final static char[] consonants = "bcdfghjklmnpqrstvwxyz".toCharArray();
 	final public static byte[] ONE = new byte[] { 0, 0, 0, 1 };
 
 	public static String bytesToHex(byte[] bytes) {
@@ -45,7 +50,7 @@ public class CryptoHelper {
 		return randomWord(3, random) + "." + randomWord(7, random);
 	}
 
-	protected static String randomWord(int lenght, SecureRandom random) {
+	private static String randomWord(int lenght, SecureRandom random) {
 		StringBuilder builder = new StringBuilder(lenght);
 		for (int i = 0; i < lenght; ++i) {
 			if (i % 2 == 0) {
@@ -91,4 +96,11 @@ public class CryptoHelper {
 		builder.insert(35, " ");
 		return builder.toString();
 	}
+
+	public static String[] getSupportedCipherSuites(final String[] platformSupportedCipherSuites) {
+		//final Collection<String> cipherSuites = new LinkedHashSet<>(Arrays.asList(Config.ENABLED_CIPHERS));
+		//cipherSuites.retainAll(Arrays.asList(platformSupportedCipherSuites));
+		//return cipherSuites.toArray(new String[cipherSuites.size()]);
+		return platformSupportedCipherSuites;
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index b4f28c45..333f6e27 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.utils;
 
 import java.util.ArrayList;
+import java.net.URLConnection;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,18 +14,25 @@ import java.util.regex.Matcher;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Downloadable;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.xmpp.jid.Jid;
+
 import android.content.Context;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.text.Spannable.Factory;
 import android.text.style.ImageSpan;
 import android.text.Spannable;
+import android.util.Pair;
 
 public class UIHelper {
 	private static final int SHORT_DATE_FLAGS = DateUtils.FORMAT_SHOW_DATE
-			| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL;
+		| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL;
 	private static final int FULL_DATE_FLAGS = DateUtils.FORMAT_SHOW_TIME
-			| DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE;
+		| DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE;
 
 	public static String readableTimeDifference(Context context, long time) {
 		return readableTimeDifference(context, time, false);
@@ -63,13 +71,21 @@ public class UIHelper {
 	}
 
 	private static boolean today(Date date) {
+		return sameDay(date,new Date(System.currentTimeMillis()));
+	}
+
+	public static boolean sameDay(long timestamp1, long timestamp2) {
+		return sameDay(new Date(timestamp1),new Date(timestamp2));
+	}
+
+	private static boolean sameDay(Date a, Date b) {
 		Calendar cal1 = Calendar.getInstance();
 		Calendar cal2 = Calendar.getInstance();
-		cal1.setTime(date);
-		cal2.setTimeInMillis(System.currentTimeMillis());
+		cal1.setTime(a);
+		cal2.setTime(b);
 		return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR)
-				&& cal1.get(Calendar.DAY_OF_YEAR) == cal2
-						.get(Calendar.DAY_OF_YEAR);
+			&& cal1.get(Calendar.DAY_OF_YEAR) == cal2
+			.get(Calendar.DAY_OF_YEAR);
 	}
 
 	public static String lastseen(Context context, long time) {
@@ -232,8 +248,117 @@ public class UIHelper {
 			return 0xFF202020;
 		}
 		int colors[] = {0xFFe91e63, 0xFF9c27b0, 0xFF673ab7, 0xFF3f51b5,
-				0xFF5677fc, 0xFF03a9f4, 0xFF00bcd4, 0xFF009688, 0xFFff5722,
-				0xFF795548, 0xFF607d8b};
+			0xFF5677fc, 0xFF03a9f4, 0xFF00bcd4, 0xFF009688, 0xFFff5722,
+			0xFF795548, 0xFF607d8b};
 		return colors[(int) ((name.hashCode() & 0xffffffffl) % colors.length)];
 	}
+
+	public static Pair<String,Boolean> getMessagePreview(final Context context, final Message message) {
+		final Downloadable d = message.getDownloadable();
+		if (d != null ) {
+			switch (d.getStatus()) {
+				case Downloadable.STATUS_CHECKING:
+					return new Pair<>(context.getString(R.string.checking_image),true);
+				case Downloadable.STATUS_DOWNLOADING:
+					return new Pair<>(context.getString(R.string.receiving_x_file,
+									getFileDescriptionString(context,message),
+									d.getProgress()),true);
+				case Downloadable.STATUS_OFFER:
+				case Downloadable.STATUS_OFFER_CHECK_FILESIZE:
+					return new Pair<>(context.getString(R.string.x_file_offered_for_download,
+									getFileDescriptionString(context,message)),true);
+				case Downloadable.STATUS_DELETED:
+					return new Pair<>(context.getString(R.string.file_deleted),true);
+				case Downloadable.STATUS_FAILED:
+					return new Pair<>(context.getString(R.string.file_transmission_failed),true);
+				case Downloadable.STATUS_UPLOADING:
+					if (message.getStatus() == Message.STATUS_OFFERED) {
+						return new Pair<>(context.getString(R.string.offering_x_file,
+								getFileDescriptionString(context, message)), true);
+					} else {
+						return new Pair<>(context.getString(R.string.sending_x_file,
+								getFileDescriptionString(context, message)), true);
+					}
+				default:
+					return new Pair<>("",false);
+			}
+		} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+			return new Pair<>(context.getString(R.string.encrypted_message_received),true);
+		} else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
+			if (message.getStatus() == Message.STATUS_RECEIVED) {
+				return new Pair<>(context.getString(R.string.received_x_file,
+							getFileDescriptionString(context, message)), true);
+			} else {
+				return new Pair<>(getFileDescriptionString(context,message),true);
+			}
+		} else {
+			if (message.getBody().startsWith(Message.ME_COMMAND)) {
+				return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND,
+						UIHelper.getMessageDisplayName(message) + " "), false);
+			} else {
+				return new Pair<>(message.getBody(), false);
+			}
+		}
+	}
+
+	public static String getFileDescriptionString(final Context context, final Message message) {
+		if (message.getType() == Message.TYPE_IMAGE) {
+			return context.getString(R.string.image);
+		}
+		final String path = message.getRelativeFilePath();
+		if (path == null) {
+			return "";
+		}
+		final String mime;
+		try {
+			mime = URLConnection.guessContentTypeFromName(path.replace("#",""));
+		} catch (final StringIndexOutOfBoundsException ignored) {
+			return context.getString(R.string.file);
+		}
+		if (mime == null) {
+			return context.getString(R.string.file);
+		} else if (mime.startsWith("audio/")) {
+			return context.getString(R.string.audio);
+		} else if(mime.startsWith("video/")) {
+			return context.getString(R.string.video);
+		} else if (mime.startsWith("image/")) {
+			return context.getString(R.string.image);
+		} else if (mime.contains("pdf")) {
+			return context.getString(R.string.pdf_document)	;
+		} else if (mime.contains("application/vnd.android.package-archive")) {
+			return context.getString(R.string.apk)	;
+		} else if (mime.contains("vcard")) {
+			return context.getString(R.string.vcard)	;
+		} else {
+			return mime;
+		}
+	}
+
+	public static String getMessageDisplayName(final Message message) {
+		if (message.getStatus() == Message.STATUS_RECEIVED) {
+			if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
+				return getDisplayedMucCounterpart(message.getCounterpart());
+			} else {
+				final Contact contact = message.getContact();
+				return contact != null ? contact.getDisplayName() : "";
+			}
+		} else {
+			if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
+				return getDisplayedMucCounterpart(message.getConversation().getJid());
+			} else {
+				final Jid jid = message.getConversation().getAccount().getJid();
+				return jid.hasLocalpart() ? jid.getLocalpart() : jid.toDomainJid().toString();
+			}
+		}
+	}
+
+	private static String getDisplayedMucCounterpart(final Jid counterpart) {
+		if (counterpart==null) {
+			return "";
+		} else if (!counterpart.isBareJid()) {
+			return counterpart.getResourcepart().trim();
+		} else {
+			return counterpart.toString().trim();
+		}
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/Xmlns.java b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
index 67de7c79..17fd2d26 100644
--- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java
+++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
@@ -4,4 +4,5 @@ public final class Xmlns {
 	public static final String BLOCKING = "urn:xmpp:blocking";
 	public static final String ROSTER = "jabber:iq:roster";
 	public static final String REGISTER = "jabber:iq:register";
+	public static final String BYTE_STREAMS = "http://jabber.org/protocol/bytestreams";
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java
index aacb6362..0f1b18c3 100644
--- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java
+++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java
@@ -18,7 +18,11 @@ public class XmppUri {
 		try {
 			parse(Uri.parse(uri));
 		} catch (IllegalArgumentException e) {
-			jid = null;
+			try {
+				jid = Jid.fromString(uri).toBareJid().toString();
+			} catch (InvalidJidException e2) {
+				jid = null;
+			}
 		}
 	}
 
@@ -42,6 +46,13 @@ public class XmppUri {
 			try {
 				jid = URLDecoder.decode(uri.getEncodedPath(), "UTF-8").split("/")[1];
 			} catch (final UnsupportedEncodingException ignored) {
+				jid = null;
+			}
+		} else {
+			try {
+				jid = Jid.fromString(uri.toString()).toBareJid().toString();
+			} catch (final InvalidJidException ignored) {
+				jid = null;
 			}
 		}
 	}
@@ -62,7 +73,7 @@ public class XmppUri {
 
 	public Jid getJid() {
 		try {
-			return Jid.fromString(this.jid);
+			return this.jid == null ? null :Jid.fromString(this.jid);
 		} catch (InvalidJidException e) {
 			return null;
 		}
@@ -71,8 +82,4 @@ public class XmppUri {
 	public String getFingerprint() {
 		return this.fingerprint;
 	}
-
-	public boolean isMuc() {
-		return this.muc;
-	}
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f7f0c346..19e271b2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -9,6 +9,7 @@ import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.util.Pair;
 import android.util.SparseArray;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
@@ -52,6 +53,7 @@ import eu.siacs.conversations.crypto.sasl.ScramSha1;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.generator.IqGenerator;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.DNSHelper;
 import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
@@ -94,17 +96,14 @@ public class XmppConnection implements Runnable {
 	private int smVersion = 3;
 	private final SparseArray<String> messageReceipts = new SparseArray<>();
 
-	private boolean enabledEncryption = false;
-	private boolean enabledCarbons = false;
-
 	private int stanzasReceived = 0;
 	private int stanzasSent = 0;
-	private long lastPaketReceived = 0;
+	private long lastPacketReceived = 0;
 	private long lastPingSent = 0;
 	private long lastConnect = 0;
 	private long lastSessionStarted = 0;
 	private int attempt = 0;
-	private final Map<String, PacketReceived> packetCallbacks = new Hashtable<>();
+	private final Map<String, Pair<IqPacket, OnIqPacketReceived>> packetCallbacks = new Hashtable<>();
 	private OnPresencePacketReceived presenceListener = null;
 	private OnJinglePacketReceived jingleListener = null;
 	private OnIqPacketReceived unregisteredIqListener = null;
@@ -146,13 +145,12 @@ public class XmppConnection implements Runnable {
 
 	protected void connect() {
 		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": connecting");
-		enabledEncryption = false;
+		features.encryptionEnabled = false;
 		lastConnect = SystemClock.elapsedRealtime();
 		lastPingSent = SystemClock.elapsedRealtime();
 		this.attempt++;
 		try {
-			shouldAuthenticate = shouldBind = !account
-				.isOptionSet(Account.OPTION_REGISTER);
+			shouldAuthenticate = shouldBind = !account.isOptionSet(Account.OPTION_REGISTER);
 			tagReader = new XmlReader(wakeLock);
 			tagWriter = new TagWriter();
 			packetCallbacks.clear();
@@ -231,6 +229,7 @@ public class XmppConnection implements Runnable {
 		} catch (final IOException | XmlPullParserException | NoSuchAlgorithmException e) {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
 			this.changeStatus(Account.State.OFFLINE);
+			this.attempt--; //don't count attempt when reconnecting instantly anyway
 		} finally {
 			if (wakeLock.isHeld()) {
 				try {
@@ -303,7 +302,7 @@ public class XmppConnection implements Runnable {
 								final RequestPacket r = new RequestPacket(smVersion);
 								tagWriter.writeStanzaAsync(r);
 							} else if (nextTag.isStart("resumed")) {
-								lastPaketReceived = SystemClock.elapsedRealtime();
+								lastPacketReceived = SystemClock.elapsedRealtime();
 								final Element resumed = tagReader.readElement(nextTag);
 								final String h = resumed.getAttribute("h");
 								try {
@@ -336,7 +335,7 @@ public class XmppConnection implements Runnable {
 								tagWriter.writeStanzaAsync(ack);
 							} else if (nextTag.isStart("a")) {
 								final Element ack = tagReader.readElement(nextTag);
-								lastPaketReceived = SystemClock.elapsedRealtime();
+								lastPacketReceived = SystemClock.elapsedRealtime();
 								final int serverSequence = Integer.parseInt(ack.getAttribute("h"));
 								final String msgId = this.messageReceipts.get(serverSequence);
 								if (msgId != null) {
@@ -372,7 +371,7 @@ public class XmppConnection implements Runnable {
 
 	private void sendInitialPing() {
 		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": sending intial ping");
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 		iq.setFrom(account.getJid());
 		iq.addChild("ping", "urn:xmpp:ping");
 		this.sendIqPacket(iq, new OnIqPacketReceived() {
@@ -425,69 +424,54 @@ public class XmppConnection implements Runnable {
 			}
 		}
 		++stanzasReceived;
-		lastPaketReceived = SystemClock.elapsedRealtime();
+		lastPacketReceived = SystemClock.elapsedRealtime();
 		return element;
 	}
 
-	private void processIq(final Tag currentTag) throws XmlPullParserException,
-					IOException {
-						final IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ);
-
-						if (packet.getId() == null) {
-							return; // an iq packet without id is definitely invalid
-						}
+	private void processIq(final Tag currentTag) throws XmlPullParserException, IOException {
+		final IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ);
 
-						if (packet instanceof JinglePacket) {
-							if (this.jingleListener != null) {
-								this.jingleListener.onJinglePacketReceived(account,
-										(JinglePacket) packet);
-							}
-						} else {
-							if (packetCallbacks.containsKey(packet.getId())) {
-								if (packetCallbacks.get(packet.getId()) instanceof OnIqPacketReceived) {
-									((OnIqPacketReceived) packetCallbacks.get(packet.getId()))
-										.onIqPacketReceived(account, packet);
-								}
+		if (packet.getId() == null) {
+			return; // an iq packet without id is definitely invalid
+		}
 
-								packetCallbacks.remove(packet.getId());
-							} else if ((packet.getType() == IqPacket.TYPE_GET || packet
-										.getType() == IqPacket.TYPE_SET)
-									&& this.unregisteredIqListener != null) {
-								this.unregisteredIqListener.onIqPacketReceived(account, packet);
-									}
-						}
+		if (packet instanceof JinglePacket) {
+			if (this.jingleListener != null) {
+				this.jingleListener.onJinglePacketReceived(account,(JinglePacket) packet);
+			}
+		} else {
+			if (packetCallbacks.containsKey(packet.getId())) {
+				final Pair<IqPacket, OnIqPacketReceived> packetCallbackDuple = packetCallbacks.get(packet.getId());
+				// Packets to the server should have responses from the server
+				if (packetCallbackDuple.first.toServer(account)) {
+					if (packet.fromServer(account)) {
+						packetCallbackDuple.second.onIqPacketReceived(account, packet);
+						packetCallbacks.remove(packet.getId());
+					} else {
+						Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
+					}
+				} else {
+					if (packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
+						packetCallbackDuple.second.onIqPacketReceived(account, packet);
+						packetCallbacks.remove(packet.getId());
+					} else {
+						Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
+					}
+				}
+			} else if (packet.getType() == IqPacket.TYPE.GET|| packet.getType() == IqPacket.TYPE.SET) {
+				this.unregisteredIqListener.onIqPacketReceived(account, packet);
+			}
+		}
 	}
 
-	private void processMessage(final Tag currentTag) throws XmlPullParserException,
-					IOException {
-						final MessagePacket packet = (MessagePacket) processPacket(currentTag,
-								PACKET_MESSAGE);
-						final String id = packet.getAttribute("id");
-						if ((id != null) && (packetCallbacks.containsKey(id))) {
-							if (packetCallbacks.get(id) instanceof OnMessagePacketReceived) {
-								((OnMessagePacketReceived) packetCallbacks.get(id))
-									.onMessagePacketReceived(account, packet);
-							}
-							packetCallbacks.remove(id);
-						} else if (this.messageListener != null) {
-							this.messageListener.onMessagePacketReceived(account, packet);
-						}
+	private void processMessage(final Tag currentTag) throws XmlPullParserException, IOException {
+		final MessagePacket packet = (MessagePacket) processPacket(currentTag,PACKET_MESSAGE);
+		this.messageListener.onMessagePacketReceived(account, packet);
 	}
 
-	private void processPresence(final Tag currentTag) throws XmlPullParserException,
-					IOException {
-						PresencePacket packet = (PresencePacket) processPacket(currentTag,
-								PACKET_PRESENCE);
-						final String id = packet.getAttribute("id");
-						if ((id != null) && (packetCallbacks.containsKey(id))) {
-							if (packetCallbacks.get(id) instanceof OnPresencePacketReceived) {
-								((OnPresencePacketReceived) packetCallbacks.get(id))
-									.onPresencePacketReceived(account, packet);
-							}
-							packetCallbacks.remove(id);
-						} else if (this.presenceListener != null) {
-							this.presenceListener.onPresencePacketReceived(account, packet);
-						}
+	private void processPresence(final Tag currentTag) throws XmlPullParserException, IOException {
+		PresencePacket packet = (PresencePacket) processPacket(currentTag, PACKET_PRESENCE);
+		this.presenceListener.onPresencePacketReceived(account, packet);
 	}
 
 	private void sendStartTLS() throws IOException {
@@ -497,8 +481,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	private SharedPreferences getPreferences() {
-		return PreferenceManager
-			.getDefaultSharedPreferences(applicationContext);
+		return PreferenceManager.getDefaultSharedPreferences(applicationContext);
 	}
 
 	private boolean enableLegacySSL() {
@@ -506,70 +489,72 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void switchOverToTls(final Tag currentTag) throws XmlPullParserException, IOException {
-        tagReader.readTag();
-        try {
+		tagReader.readTag();
+		try {
 			final SSLContext sc = SSLContext.getInstance("TLS");
 			sc.init(null,new X509TrustManager[]{this.mXmppConnectionService.getMemorizingTrustManager()},mXmppConnectionService.getRNG());
 			final SSLSocketFactory factory = sc.getSocketFactory();
 			final HostnameVerifier verifier = this.mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier());
-            final InetAddress address = socket == null ? null : socket.getInetAddress();
+			final InetAddress address = socket == null ? null : socket.getInetAddress();
 
 			if (factory == null || address == null || verifier == null) {
 				throw new IOException("could not setup ssl");
 			}
 
-            final SSLSocket sslSocket = (SSLSocket) factory.createSocket(socket,address.getHostAddress(), socket.getPort(),true);
+			final SSLSocket sslSocket = (SSLSocket) factory.createSocket(socket,address.getHostAddress(), socket.getPort(),true);
 
 			if (sslSocket == null) {
 				throw new IOException("could not initialize ssl socket");
 			}
 
 			final String[] supportProtocols;
-			if (enableLegacySSL()) {
-				supportProtocols = sslSocket.getSupportedProtocols();
-			} else {
-				final Collection<String> supportedProtocols = new LinkedList<>(
-						Arrays.asList(sslSocket.getSupportedProtocols()));
-				supportedProtocols.remove("SSLv3");
-				supportProtocols = new String[supportedProtocols.size()];
-				supportedProtocols.toArray(supportProtocols);
-            }
+			final Collection<String> supportedProtocols = new LinkedList<>(
+					Arrays.asList(sslSocket.getSupportedProtocols()));
+			supportedProtocols.remove("SSLv3");
+			supportProtocols = supportedProtocols.toArray(new String[supportedProtocols.size()]);
+
 			sslSocket.setEnabledProtocols(supportProtocols);
 
-            if (!verifier.verify(account.getServer().getDomainpart(),sslSocket.getSession())) {
-                Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
-                disconnect(true);
-                changeStatus(Account.State.SECURITY_ERROR);
+			final String[] cipherSuites = CryptoHelper.getSupportedCipherSuites(
+					sslSocket.getSupportedCipherSuites());
+			if (cipherSuites.length > 0) {
+				sslSocket.setEnabledCipherSuites(cipherSuites);
+			}
+
+			if (!verifier.verify(account.getServer().getDomainpart(),sslSocket.getSession())) {
+				Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
+				disconnect(true);
+				changeStatus(Account.State.SECURITY_ERROR);
 			}
 			tagReader.setInputStream(sslSocket.getInputStream());
 			tagWriter.setOutputStream(sslSocket.getOutputStream());
 			sendStartStream();
 			Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established");
-			enabledEncryption = true;
+			features.encryptionEnabled = true;
 			processStream(tagReader.readTag());
 			sslSocket.close();
-        } catch (final NoSuchAlgorithmException | KeyManagementException e1) {
+		} catch (final NoSuchAlgorithmException | KeyManagementException e1) {
 			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": TLS certificate verification failed");
 			disconnect(true);
 			changeStatus(Account.State.SECURITY_ERROR);
-        }
+		}
 	}
 
 	private void processStreamFeatures(final Tag currentTag)
 		throws XmlPullParserException, IOException {
 		this.streamFeatures = tagReader.readElement(currentTag);
-		if (this.streamFeatures.hasChild("starttls") && !enabledEncryption) {
+		if (this.streamFeatures.hasChild("starttls") && !features.encryptionEnabled) {
 			sendStartTLS();
 		} else if (this.streamFeatures.hasChild("register")
 				&& account.isOptionSet(Account.OPTION_REGISTER)
-				&& enabledEncryption) {
+				&& features.encryptionEnabled) {
 			sendRegistryRequest();
 		} else if (!this.streamFeatures.hasChild("register")
 				&& account.isOptionSet(Account.OPTION_REGISTER)) {
 			changeStatus(Account.State.REGISTRATION_NOT_SUPPORTED);
 			disconnect(true);
 		} else if (this.streamFeatures.hasChild("mechanisms")
-				&& shouldAuthenticate && enabledEncryption) {
+				&& shouldAuthenticate && features.encryptionEnabled) {
 			final List<String> mechanisms = extractMechanisms(streamFeatures
 					.findChild("mechanisms"));
 			final Element auth = new Element("auth");
@@ -625,7 +610,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void sendRegistryRequest() {
-		final IqPacket register = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket register = new IqPacket(IqPacket.TYPE.GET);
 		register.query("jabber:iq:register");
 		register.setTo(account.getServer());
 		sendIqPacket(register, new OnIqPacketReceived() {
@@ -635,7 +620,7 @@ public class XmppConnection implements Runnable {
 				final Element instructions = packet.query().findChild("instructions");
 				if (packet.query().hasChild("username")
 						&& (packet.query().hasChild("password"))) {
-					final IqPacket register = new IqPacket(IqPacket.TYPE_SET);
+					final IqPacket register = new IqPacket(IqPacket.TYPE.SET);
 					final Element username = new Element("username")
 						.setContent(account.getUsername());
 					final Element password = new Element("password")
@@ -646,7 +631,7 @@ public class XmppConnection implements Runnable {
 
 						@Override
 						public void onIqPacketReceived(final Account account, final IqPacket packet) {
-							if (packet.getType() == IqPacket.TYPE_RESULT) {
+							if (packet.getType() == IqPacket.TYPE.RESULT) {
 								account.setOption(Account.OPTION_REGISTER,
 										false);
 								changeStatus(Account.State.REGISTRATION_SUCCESSFUL);
@@ -673,10 +658,10 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void sendBindRequest() {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		iq.addChild("bind", "urn:ietf:params:xml:ns:xmpp-bind")
 			.addChild("resource").setContent(account.getResource());
-		this.sendUnboundIqPacket(iq, new OnIqPacketReceived() {
+		this.sendUnmodifiedIqPacket(iq, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(final Account account, final IqPacket packet) {
 				final Element bind = packet.findChild("bind");
@@ -694,15 +679,15 @@ public class XmppConnection implements Runnable {
 							tagWriter.writeStanzaAsync(enable);
 							stanzasSent = 0;
 							messageReceipts.clear();
-						} else if (streamFeatures.hasChild("sm",
-									"urn:xmpp:sm:2")) {
+						} else if (streamFeatures.hasChild("sm", "urn:xmpp:sm:2")) {
 							smVersion = 2;
 							final EnablePacket enable = new EnablePacket(smVersion);
 							tagWriter.writeStanzaAsync(enable);
 							stanzasSent = 0;
 							messageReceipts.clear();
 						}
-						enabledCarbons = false;
+						features.carbonsEnabled = false;
+						features.blockListRequested = false;
 						disco.clear();
 						sendServiceDiscoveryInfo(account.getServer());
 						sendServiceDiscoveryItems(account.getServer());
@@ -719,12 +704,10 @@ public class XmppConnection implements Runnable {
 			}
 		});
 		if (this.streamFeatures.hasChild("session")) {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid()
-					+ ": sending deprecated session");
-			final IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
-			startSession.addChild("session",
-					"urn:ietf:params:xml:ns:xmpp-session");
-			this.sendUnboundIqPacket(startSession, null);
+			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": sending deprecated session");
+			final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET);
+			startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session");
+			this.sendUnmodifiedIqPacket(startSession, null);
 		}
 	}
 
@@ -734,7 +717,7 @@ public class XmppConnection implements Runnable {
 				enableAdvancedStreamFeatures();
 			}
 		} else {
-			final IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+			final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 			iq.setTo(server.toDomainJid());
 			iq.query("http://jabber.org/protocol/disco#info");
 			this.sendIqPacket(iq, new OnIqPacketReceived() {
@@ -767,19 +750,17 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void enableAdvancedStreamFeatures() {
-		if (getFeatures().carbons()) {
-			if (!enabledCarbons) {
-				sendEnableCarbons();
-			}
+		if (getFeatures().carbons() && !features.carbonsEnabled) {
+			sendEnableCarbons();
 		}
-		if (getFeatures().blocking()) {
+		if (getFeatures().blocking() && !features.blockListRequested) {
 			Log.d(Config.LOGTAG, "Requesting block list");
 			this.sendIqPacket(getIqGenerator().generateGetBlockList(), mXmppConnectionService.getIqParser());
 		}
 	}
 
 	private void sendServiceDiscoveryItems(final Jid server) {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 		iq.setTo(server.toDomainJid());
 		iq.query("http://jabber.org/protocol/disco#items");
 		this.sendIqPacket(iq, new OnIqPacketReceived() {
@@ -800,7 +781,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void sendEnableCarbons() {
-		final IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		iq.addChild("enable", "urn:xmpp:carbons:2");
 		this.sendIqPacket(iq, new OnIqPacketReceived() {
 
@@ -809,7 +790,7 @@ public class XmppConnection implements Runnable {
 				if (!packet.hasChild("error")) {
 					Log.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": successfully enabled carbons");
-					enabledCarbons = true;
+					features.carbonsEnabled = true;
 				} else {
 					Log.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": error enableing carbons " + packet.toString());
@@ -845,49 +826,44 @@ public class XmppConnection implements Runnable {
 		return new BigInteger(50, mXmppConnectionService.getRNG()).toString(32);
 	}
 
-	public void sendIqPacket(final IqPacket packet, final PacketReceived callback) {
-		if (packet.getId() == null) {
-			final String id = nextRandomId();
-			packet.setAttribute("id", id);
-		}
+	public void sendIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {
 		packet.setFrom(account.getJid());
-		this.sendPacket(packet, callback);
+		this.sendUnmodifiedIqPacket(packet,callback);
+
 	}
 
-	public void sendUnboundIqPacket(final IqPacket packet, final PacketReceived callback) {
+	private synchronized void sendUnmodifiedIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {
 		if (packet.getId() == null) {
 			final String id = nextRandomId();
 			packet.setAttribute("id", id);
 		}
-		this.sendPacket(packet, callback);
+		if (callback != null) {
+			if (packet.getId() == null) {
+				packet.setId(nextRandomId());
+			}
+			packetCallbacks.put(packet.getId(), new Pair<>(packet, callback));
+		}
+		this.sendPacket(packet);
 	}
 
 	public void sendMessagePacket(final MessagePacket packet) {
-		this.sendPacket(packet, null);
+		this.sendPacket(packet);
 	}
 
 	public void sendPresencePacket(final PresencePacket packet) {
-		this.sendPacket(packet, null);
+		this.sendPacket(packet);
 	}
 
-	private synchronized void sendPacket(final AbstractStanza packet, final PacketReceived callback) {
-		if (packet.getName().equals("iq") || packet.getName().equals("message")
-				|| packet.getName().equals("presence")) {
+	private synchronized void sendPacket(final AbstractStanza packet) {
+		final String name = packet.getName();
+		if (name.equals("iq") || name.equals("message") || name.equals("presence")) {
 			++stanzasSent;
-				}
+		}
 		tagWriter.writeStanzaAsync(packet);
-		if (packet instanceof MessagePacket && packet.getId() != null
-				&& this.streamId != null) {
-			Log.d(Config.LOGTAG, "request delivery report for stanza "
-					+ stanzasSent);
+		if (packet instanceof MessagePacket && packet.getId() != null && this.streamId != null) {
+			Log.d(Config.LOGTAG, "request delivery report for stanza " + stanzasSent);
 			this.messageReceipts.put(stanzasSent, packet.getId());
 			tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
-				}
-		if (callback != null) {
-			if (packet.getId() == null) {
-				packet.setId(nextRandomId());
-			}
-			packetCallbacks.put(packet.getId(), callback);
 		}
 	}
 
@@ -895,7 +871,7 @@ public class XmppConnection implements Runnable {
 		if (streamFeatures.hasChild("sm")) {
 			tagWriter.writeStanzaAsync(new RequestPacket(smVersion));
 		} else {
-			final IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+			final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 			iq.setFrom(account.getJid());
 			iq.addChild("ping", "urn:xmpp:ping");
 			this.sendIqPacket(iq, null);
@@ -1040,19 +1016,22 @@ public class XmppConnection implements Runnable {
 	}
 
 	public long getLastPacketReceived() {
-		return this.lastPaketReceived;
+		return this.lastPacketReceived;
 	}
 
 	public void sendActive() {
-		this.sendPacket(new ActivePacket(), null);
+		this.sendPacket(new ActivePacket());
 	}
 
 	public void sendInactive() {
-		this.sendPacket(new InactivePacket(), null);
+		this.sendPacket(new InactivePacket());
 	}
 
 	public class Features {
 		XmppConnection connection;
+		private boolean carbonsEnabled = false;
+		private boolean encryptionEnabled = false;
+		private boolean blockListRequested = false;
 
 		public Features(final XmppConnection connection) {
 			this.connection = connection;
@@ -1100,9 +1079,8 @@ public class XmppConnection implements Runnable {
 			return connection.streamFeatures != null && connection.streamFeatures.hasChild("ver");
 		}
 
-		public boolean streamhost() {
-			return connection
-				.findDiscoItemByFeature("http://jabber.org/protocol/bytestreams") != null;
+		public void setBlockListRequested(boolean value) {
+			this.blockListRequested = value;
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
index 281ea3ca..dcadb92f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
@@ -85,8 +85,7 @@ public class JingleCandidate {
 	}
 
 	public boolean equalValues(JingleCandidate other) {
-		return other.getHost().equals(this.getHost())
-				&& (other.getPort() == this.getPort());
+		return other != null && other.getHost().equals(this.getHost()) && (other.getPort() == this.getPort());
 	}
 
 	public boolean isOurs() {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index d578ca38..2d949e21 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -36,8 +36,6 @@ public class JingleConnection implements Downloadable {
 
 	protected static final int JINGLE_STATUS_INITIATED = 0;
 	protected static final int JINGLE_STATUS_ACCEPTED = 1;
-	protected static final int JINGLE_STATUS_TERMINATED = 2;
-	protected static final int JINGLE_STATUS_CANCELED = 3;
 	protected static final int JINGLE_STATUS_FINISHED = 4;
 	protected static final int JINGLE_STATUS_TRANSMITTING = 5;
 	protected static final int JINGLE_STATUS_FAILED = 99;
@@ -75,7 +73,7 @@ public class JingleConnection implements Downloadable {
 
 		@Override
 		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (packet.getType() == IqPacket.TYPE_ERROR) {
+			if (packet.getType() == IqPacket.TYPE.ERROR) {
 				fail();
 			}
 		}
@@ -101,11 +99,9 @@ public class JingleConnection implements Downloadable {
 					file.delete();
 				}
 			}
-			Log.d(Config.LOGTAG,
-					"sucessfully transmitted file:" + file.getAbsolutePath());
+			Log.d(Config.LOGTAG,"sucessfully transmitted file:" + file.getAbsolutePath());
 			if (message.getEncryption() != Message.ENCRYPTION_PGP) {
-				Intent intent = new Intent(
-						Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+				Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
 				intent.setData(Uri.fromFile(file));
 				mXmppConnectionService.sendBroadcast(intent);
 			}
@@ -191,10 +187,10 @@ public class JingleConnection implements Downloadable {
 		}
 		IqPacket response;
 		if (returnResult) {
-			response = packet.generateResponse(IqPacket.TYPE_RESULT);
+			response = packet.generateResponse(IqPacket.TYPE.RESULT);
 
 		} else {
-			response = packet.generateResponse(IqPacket.TYPE_ERROR);
+			response = packet.generateResponse(IqPacket.TYPE.ERROR);
 		}
 		account.getXmppConnection().sendIqPacket(response, null);
 	}
@@ -280,16 +276,18 @@ public class JingleConnection implements Downloadable {
 			Element fileNameElement = fileOffer.findChild("name");
 			if (fileNameElement != null) {
 				String[] filename = fileNameElement.getContent()
-						.toLowerCase(Locale.US).split("\\.");
-				if (Arrays.asList(VALID_IMAGE_EXTENSIONS).contains(
-						filename[filename.length - 1])) {
+						.toLowerCase(Locale.US).toLowerCase().split("\\.");
+				String extension = filename[filename.length - 1];
+				if (Arrays.asList(VALID_IMAGE_EXTENSIONS).contains(extension)) {
 					message.setType(Message.TYPE_IMAGE);
+					message.setRelativeFilePath(message.getUuid()+"."+extension);
 				} else if (Arrays.asList(VALID_CRYPTO_EXTENSIONS).contains(
 						filename[filename.length - 1])) {
 					if (filename.length == 3) {
-						if (Arrays.asList(VALID_IMAGE_EXTENSIONS).contains(
-								filename[filename.length - 2])) {
+						extension = filename[filename.length - 2];
+						if (Arrays.asList(VALID_IMAGE_EXTENSIONS).contains(extension)) {
 							message.setType(Message.TYPE_IMAGE);
+							message.setRelativeFilePath(message.getUuid()+"."+extension);
 						} else {
 							message.setType(Message.TYPE_FILE);
 						}
@@ -360,7 +358,6 @@ public class JingleConnection implements Downloadable {
 	}
 
 	private void sendInitRequest() {
-		this.mXmppConnectionService.markMessage(this.message, Message.STATUS_OFFERED);
 		JinglePacket packet = this.bootstrapPacket("session-initiate");
 		Content content = new Content(this.contentCreator, this.contentName);
 		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
@@ -379,8 +376,19 @@ public class JingleConnection implements Downloadable {
 			content.setTransportId(this.transportId);
 			content.socks5transport().setChildren(getCandidatesAsElements());
 			packet.setContent(content);
-			this.sendJinglePacket(packet);
-			this.mJingleStatus = JINGLE_STATUS_INITIATED;
+			this.sendJinglePacket(packet,new OnIqPacketReceived() {
+
+				@Override
+				public void onIqPacketReceived(Account account, IqPacket packet) {
+					if (packet.getType() != IqPacket.TYPE.ERROR) {
+						mJingleStatus = JINGLE_STATUS_INITIATED;
+						mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
+					} else {
+						fail();
+					}
+				}
+			});
+
 		}
 	}
 
@@ -396,58 +404,48 @@ public class JingleConnection implements Downloadable {
 		mJingleStatus = JINGLE_STATUS_ACCEPTED;
 		this.mStatus = Downloadable.STATUS_DOWNLOADING;
 		mXmppConnectionService.updateConversationUi();
-		this.mJingleConnectionManager.getPrimaryCandidate(this.account,
-				new OnPrimaryCandidateFound() {
-
-					@Override
-					public void onPrimaryCandidateFound(boolean success,
-							final JingleCandidate candidate) {
-						final JinglePacket packet = bootstrapPacket("session-accept");
-						final Content content = new Content(contentCreator,
-								contentName);
-						content.setFileOffer(fileOffer);
-						content.setTransportId(transportId);
-						if ((success) && (!equalCandidateExists(candidate))) {
-							final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
-									JingleConnection.this, candidate);
-							connections.put(candidate.getCid(), socksConnection);
-							socksConnection.connect(new OnTransportConnected() {
-
-								@Override
-								public void failed() {
-									Log.d(Config.LOGTAG,
-											"connection to our own primary candidate failed");
-									content.socks5transport().setChildren(
-											getCandidatesAsElements());
-									packet.setContent(content);
-									sendJinglePacket(packet);
-									connectNextCandidate();
-								}
+		this.mJingleConnectionManager.getPrimaryCandidate(this.account, new OnPrimaryCandidateFound() {
+			@Override
+			public void onPrimaryCandidateFound(boolean success, final JingleCandidate candidate) {
+				final JinglePacket packet = bootstrapPacket("session-accept");
+				final Content content = new Content(contentCreator,contentName);
+				content.setFileOffer(fileOffer);
+				content.setTransportId(transportId);
+				if (success && candidate != null && !equalCandidateExists(candidate)) {
+					final JingleSocks5Transport socksConnection = new JingleSocks5Transport(
+							JingleConnection.this,
+							candidate);
+					connections.put(candidate.getCid(), socksConnection);
+					socksConnection.connect(new OnTransportConnected() {
 
-								@Override
-								public void established() {
-									Log.d(Config.LOGTAG,
-											"connected to primary candidate");
-									mergeCandidate(candidate);
-									content.socks5transport().setChildren(
-											getCandidatesAsElements());
-									packet.setContent(content);
-									sendJinglePacket(packet);
-									connectNextCandidate();
-								}
-							});
-						} else {
-							Log.d(Config.LOGTAG,
-									"did not find a primary candidate for ourself");
-							content.socks5transport().setChildren(
-									getCandidatesAsElements());
+						@Override
+						public void failed() {
+							Log.d(Config.LOGTAG,"connection to our own primary candidate failed");
+							content.socks5transport().setChildren(getCandidatesAsElements());
 							packet.setContent(content);
 							sendJinglePacket(packet);
 							connectNextCandidate();
 						}
-					}
-				});
 
+						@Override
+						public void established() {
+							Log.d(Config.LOGTAG, "connected to primary candidate");
+							mergeCandidate(candidate);
+							content.socks5transport().setChildren(getCandidatesAsElements());
+							packet.setContent(content);
+							sendJinglePacket(packet);
+							connectNextCandidate();
+						}
+					});
+				} else {
+					Log.d(Config.LOGTAG,"did not find a primary candidate for ourself");
+					content.socks5transport().setChildren(getCandidatesAsElements());
+					packet.setContent(content);
+					sendJinglePacket(packet);
+					connectNextCandidate();
+				}
+			}
+		});
 	}
 
 	private JinglePacket bootstrapPacket(String action) {
@@ -461,10 +459,13 @@ public class JingleConnection implements Downloadable {
 	}
 
 	private void sendJinglePacket(JinglePacket packet) {
-		// Log.d(Config.LOGTAG,packet.toString());
 		account.getXmppConnection().sendIqPacket(packet, responseListener);
 	}
 
+	private void sendJinglePacket(JinglePacket packet, OnIqPacketReceived callback) {
+		account.getXmppConnection().sendIqPacket(packet,callback);
+	}
+
 	private boolean receiveAccept(JinglePacket packet) {
 		Content content = packet.getJingleContent();
 		mergeCandidates(JingleCandidate.parse(content.socks5transport()
@@ -479,16 +480,13 @@ public class JingleConnection implements Downloadable {
 		Content content = packet.getJingleContent();
 		if (content.hasSocks5Transport()) {
 			if (content.socks5transport().hasChild("activated")) {
-				if ((this.transport != null)
-						&& (this.transport instanceof JingleSocks5Transport)) {
+				if ((this.transport != null) && (this.transport instanceof JingleSocks5Transport)) {
 					onProxyActivated.success();
 				} else {
-					String cid = content.socks5transport()
-							.findChild("activated").getAttribute("cid");
+					String cid = content.socks5transport().findChild("activated").getAttribute("cid");
 					Log.d(Config.LOGTAG, "received proxy activated (" + cid
 							+ ")prior to choosing our own transport");
-					JingleSocks5Transport connection = this.connections
-							.get(cid);
+					JingleSocks5Transport connection = this.connections.get(cid);
 					if (connection != null) {
 						connection.setActivated(true);
 					} else {
@@ -552,7 +550,7 @@ public class JingleConnection implements Downloadable {
 					Log.d(Config.LOGTAG, "candidate "
 							+ connection.getCandidate().getCid()
 							+ " was our proxy. going to activate");
-					IqPacket activation = new IqPacket(IqPacket.TYPE_SET);
+					IqPacket activation = new IqPacket(IqPacket.TYPE.SET);
 					activation.setTo(connection.getCandidate().getJid());
 					activation.query("http://jabber.org/protocol/bytestreams")
 							.setAttribute("sid", this.getSessionId());
@@ -564,7 +562,7 @@ public class JingleConnection implements Downloadable {
 								@Override
 								public void onIqPacketReceived(Account account,
 										IqPacket packet) {
-									if (packet.getType() == IqPacket.TYPE_ERROR) {
+									if (packet.getType() == IqPacket.TYPE.ERROR) {
 										onProxyActivated.failed();
 									} else {
 										onProxyActivated.success();
@@ -707,8 +705,7 @@ public class JingleConnection implements Downloadable {
 
 	private void receiveSuccess() {
 		this.mJingleStatus = JINGLE_STATUS_FINISHED;
-		this.mXmppConnectionService.markMessage(this.message,
-				Message.STATUS_SEND);
+		this.mXmppConnectionService.markMessage(this.message,Message.STATUS_SEND_RECEIVED);
 		this.disconnectSocks5Connections();
 		if (this.transport != null && this.transport instanceof JingleInbandTransport) {
 			this.transport.disconnect();
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index b0a730b1..5dfa3ff4 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -12,6 +12,7 @@ import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.AbstractConnectionManager;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnIqPacketReceived;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
@@ -46,7 +47,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 					return;
 				}
 			}
-			IqPacket response = packet.generateResponse(IqPacket.TYPE_ERROR);
+			IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
 			Element error = response.addChild("error");
 			error.setAttribute("type", "cancel");
 			error.addChild("item-not-found",
@@ -80,49 +81,37 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 			return;
 		}
 		if (!this.primaryCandidates.containsKey(account.getJid().toBareJid())) {
-			String xmlns = "http://jabber.org/protocol/bytestreams";
-			final String proxy = account.getXmppConnection()
-					.findDiscoItemByFeature(xmlns);
+			final String proxy = account.getXmppConnection().findDiscoItemByFeature(Xmlns.BYTE_STREAMS);
 			if (proxy != null) {
-				IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+				IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
 				iq.setAttribute("to", proxy);
-				iq.query(xmlns);
-				account.getXmppConnection().sendIqPacket(iq,
-						new OnIqPacketReceived() {
+				iq.query(Xmlns.BYTE_STREAMS);
+				account.getXmppConnection().sendIqPacket(iq,new OnIqPacketReceived() {
 
-							@Override
-							public void onIqPacketReceived(Account account,
-									IqPacket packet) {
-								Element streamhost = packet
-										.query()
-										.findChild("streamhost",
-												"http://jabber.org/protocol/bytestreams");
-								if (streamhost != null) {
-									JingleCandidate candidate = new JingleCandidate(
-											nextRandomId(), true);
-									candidate.setHost(streamhost
-											.getAttribute("host"));
-									candidate.setPort(Integer
-											.parseInt(streamhost
-													.getAttribute("port")));
-									candidate
-											.setType(JingleCandidate.TYPE_PROXY);
-                                    try {
-                                        candidate.setJid(Jid.fromString(proxy));
-                                    } catch (final InvalidJidException e) {
-                                        candidate.setJid(null);
-                                    }
-                                    candidate.setPriority(655360 + 65535);
-									primaryCandidates.put(account.getJid().toBareJid(),
-											candidate);
-									listener.onPrimaryCandidateFound(true,
-											candidate);
-								} else {
-									listener.onPrimaryCandidateFound(false,
-											null);
-								}
+					@Override
+					public void onIqPacketReceived(Account account, IqPacket packet) {
+						Element streamhost = packet.query().findChild("streamhost",Xmlns.BYTE_STREAMS);
+						final String host = streamhost == null ? null : streamhost.getAttribute("host");
+						final String port = streamhost == null ? null : streamhost.getAttribute("port");
+						if (host != null && port != null) {
+							try {
+								JingleCandidate candidate = new JingleCandidate(nextRandomId(), true);
+								candidate.setHost(host);
+								candidate.setPort(Integer.parseInt(port));
+								candidate.setType(JingleCandidate.TYPE_PROXY);
+								candidate.setJid(Jid.fromString(proxy));
+								candidate.setPriority(655360 + 65535);
+								primaryCandidates.put(account.getJid().toBareJid(),candidate);
+								listener.onPrimaryCandidateFound(true,candidate);
+							} catch (final NumberFormatException | InvalidJidException e) {
+								listener.onPrimaryCandidateFound(false,null);
+								return;
 							}
-						});
+						} else {
+							listener.onPrimaryCandidateFound(false,null);
+						}
+					}
+				});
 			} else {
 				listener.onPrimaryCandidateFound(false, null);
 			}
@@ -141,12 +130,10 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 		String sid = null;
 		Element payload = null;
 		if (packet.hasChild("open", "http://jabber.org/protocol/ibb")) {
-			payload = packet
-					.findChild("open", "http://jabber.org/protocol/ibb");
+			payload = packet.findChild("open", "http://jabber.org/protocol/ibb");
 			sid = payload.getAttribute("sid");
 		} else if (packet.hasChild("data", "http://jabber.org/protocol/ibb")) {
-			payload = packet
-					.findChild("data", "http://jabber.org/protocol/ibb");
+			payload = packet.findChild("data", "http://jabber.org/protocol/ibb");
 			sid = payload.getAttribute("sid");
 		}
 		if (sid != null) {
@@ -161,10 +148,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 					}
 				}
 			}
-			Log.d(Config.LOGTAG,
-					"couldnt deliver payload: " + payload.toString());
+			Log.d(Config.LOGTAG,"couldn't deliver payload: " + payload.toString());
 		} else {
-			Log.d(Config.LOGTAG, "no sid found in incomming ibb packet");
+			Log.d(Config.LOGTAG, "no sid found in incoming ibb packet");
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index e25f7e65..174f70fa 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
@@ -44,7 +44,7 @@ public class JingleInbandTransport extends JingleTransport {
 	private OnIqPacketReceived onAckReceived = new OnIqPacketReceived() {
 		@Override
 		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (connected && packet.getType() == IqPacket.TYPE_RESULT) {
+			if (connected && packet.getType() == IqPacket.TYPE.RESULT) {
 				sendNextBlock();
 			}
 		}
@@ -60,7 +60,7 @@ public class JingleInbandTransport extends JingleTransport {
 	}
 
 	public void connect(final OnTransportConnected callback) {
-		IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		iq.setTo(this.counterpart);
 		Element open = iq.addChild("open", "http://jabber.org/protocol/ibb");
 		open.setAttribute("sid", this.sessionId);
@@ -73,7 +73,7 @@ public class JingleInbandTransport extends JingleTransport {
 					@Override
 					public void onIqPacketReceived(Account account,
 							IqPacket packet) {
-						if (packet.getType() == IqPacket.TYPE_ERROR) {
+						if (packet.getType() == IqPacket.TYPE.ERROR) {
 							callback.failed();
 						} else {
 							callback.established();
@@ -157,7 +157,7 @@ public class JingleInbandTransport extends JingleTransport {
 				this.remainingSize -= count;
 				this.digest.update(buffer);
 				String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
-				IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+				IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 				iq.setTo(this.counterpart);
 				Element data = iq.addChild("data",
 						"http://jabber.org/protocol/ibb");
@@ -208,15 +208,15 @@ public class JingleInbandTransport extends JingleTransport {
 				established = true;
 				connected = true;
 				this.account.getXmppConnection().sendIqPacket(
-						packet.generateResponse(IqPacket.TYPE_RESULT), null);
+						packet.generateResponse(IqPacket.TYPE.RESULT), null);
 			} else {
 				this.account.getXmppConnection().sendIqPacket(
-						packet.generateResponse(IqPacket.TYPE_ERROR), null);
+						packet.generateResponse(IqPacket.TYPE.ERROR), null);
 			}
 		} else if (connected && payload.getName().equals("data")) {
 			this.receiveNextBlock(payload.getContent());
 			this.account.getXmppConnection().sendIqPacket(
-					packet.generateResponse(IqPacket.TYPE_RESULT), null);
+					packet.generateResponse(IqPacket.TYPE.RESULT), null);
 		} else {
 			// TODO some sort of exception
 		}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index 1a49b45e..55256ece 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
@@ -1,11 +1,12 @@
 package eu.siacs.conversations.xmpp.stanzas;
 
+import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class AbstractStanza extends Element {
 
-	protected AbstractStanza(String name) {
+	protected AbstractStanza(final String name) {
 		super(name);
 	}
 
@@ -36,4 +37,18 @@ public class AbstractStanza extends Element {
 	public void setId(final String id) {
 		setAttribute("id", id);
 	}
+
+	public boolean fromServer(final Account account) {
+		return getFrom() == null
+			|| getFrom().equals(account.getServer())
+			|| getFrom().equals(account.getJid().toBareJid())
+			|| getFrom().equals(account.getJid());
+	}
+
+	public boolean toServer(final Account account) {
+		return getTo() == null
+			|| getTo().equals(account.getServer())
+			|| getTo().equals(account.getJid().toBareJid())
+			|| getTo().equals(account.getJid());
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
index 2481112b..7b36fc49 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
@@ -4,32 +4,18 @@ import eu.siacs.conversations.xml.Element;
 
 public class IqPacket extends AbstractStanza {
 
-	public static final int TYPE_ERROR = -1;
-	public static final int TYPE_SET = 0;
-	public static final int TYPE_RESULT = 1;
-	public static final int TYPE_GET = 2;
-
-	private IqPacket(final String name) {
-		super(name);
+	public static enum TYPE {
+		ERROR,
+		SET,
+		RESULT,
+		GET,
+		INVALID
 	}
 
-	public IqPacket(final int type) {
+	public IqPacket(final TYPE type) {
 		super("iq");
-		switch (type) {
-			case TYPE_SET:
-				this.setAttribute("type", "set");
-				break;
-			case TYPE_GET:
-				this.setAttribute("type", "get");
-				break;
-			case TYPE_RESULT:
-				this.setAttribute("type", "result");
-				break;
-			case TYPE_ERROR:
-				this.setAttribute("type", "error");
-				break;
-			default:
-				break;
+		if (type != TYPE.INVALID) {
+			this.setAttribute("type", type.toString().toLowerCase());
 		}
 	}
 
@@ -51,23 +37,23 @@ public class IqPacket extends AbstractStanza {
 		return query();
 	}
 
-	public int getType() {
+	public TYPE getType() {
 		final String type = getAttribute("type");
 		switch (type) {
 			case "error":
-				return TYPE_ERROR;
+				return TYPE.ERROR;
 			case "result":
-				return TYPE_RESULT;
+				return TYPE.RESULT;
 			case "set":
-				return TYPE_SET;
+				return TYPE.SET;
 			case "get":
-				return TYPE_GET;
+				return TYPE.GET;
 			default:
-				return 1000;
+				return TYPE.INVALID;
 		}
 	}
 
-	public IqPacket generateResponse(final int type) {
+	public IqPacket generateResponse(final TYPE type) {
 		final IqPacket packet = new IqPacket(type);
 		packet.setTo(this.getFrom());
 		packet.setId(this.getId());
diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 00000000..e206f296
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/src/main/res/drawable-hdpi/ic_action_download.png b/src/main/res/drawable-hdpi/ic_action_download.png
new file mode 100644
index 00000000..9fc6455a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_download.png
diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..0eb78f7c
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..72cedcad
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..7256ca3d
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..794b7b78
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..71cac75a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..bd2c60b8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..0e95e9b1
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..f8970cb2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..34ec7092
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..46aeab45
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..a5ad0a29
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..a6ed594f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..c3497037
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png
deleted file mode 100644
index 6de8969f..00000000
--- a/src/main/res/drawable-hdpi/ic_indicator.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..b90a5980
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..d0c25290
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..074db2d3
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..72128fe6
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..aeb1cea9
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..0bbeab15
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..cff84744
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..c8b7140a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_action_cancel.png b/src/main/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 00000000..70e6d2d2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/src/main/res/drawable-mdpi/ic_action_download.png b/src/main/res/drawable-mdpi/ic_action_download.png
new file mode 100644
index 00000000..84b43d34
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_download.png
diff --git a/src/main/res/drawable-mdpi/ic_action_settings.png b/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 00000000..c290e590
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..67042105
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..db23fd65
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..df332ef3
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..526ebec6
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..5592d5c8
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..cdb230c2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..b5f88c80
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..7f0ea51b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..e089466d
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..6055325e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..0c5fd333
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..fb82f420
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_indicator.png b/src/main/res/drawable-mdpi/ic_indicator.png
deleted file mode 100644
index bb4fee10..00000000
--- a/src/main/res/drawable-mdpi/ic_indicator.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..6e1321e4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..2d2c9417
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..c402e8f0
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..5f89fc25
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..efc9560e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..043759ac
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..20d2b66e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..30eee6c4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 00000000..d1634205
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_download.png b/src/main/res/drawable-xhdpi/ic_action_download.png
new file mode 100644
index 00000000..702ad476
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_download.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 00000000..999d0f0d
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..2bef0595
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..caaee37a
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..e9e9c7a5
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..1230ab39
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..2fdbbea1
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..ccf8c716
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..6ed4351c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..9380370f
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..990dfb82
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..0ac3d4a8
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..a62b5677
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..06b27ea1
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_indicator.png b/src/main/res/drawable-xhdpi/ic_indicator.png
deleted file mode 100644
index 3e5141c2..00000000
--- a/src/main/res/drawable-xhdpi/ic_indicator.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..8f35034c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..3de35f9b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..4e2121e5
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..d271d8e0
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..3d5136fe
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..70c21baf
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..6a70402b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..3f401317
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 00000000..5dc21435
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png
new file mode 100644
index 00000000..6bcd8313
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_download.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 00000000..530227e2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..b12e040e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..b50e5161
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..faa409f8
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..bb39d157
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..72b3474b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..a8d8ca84
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..21b617a9
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..fe5bd13f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..95502de3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..7ff60d6f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..fffa6a6a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..cabd50c0
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
deleted file mode 100644
index 2c51b8b7..00000000
--- a/src/main/res/drawable-xxhdpi/ic_indicator.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..031eb06e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..f57082d8
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..ba242487
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..87ab2d64
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..4b1003db
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..75d9aa69
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..d47d042e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..a6e5788b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..cd32f0a8
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..55464b7e
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..b9b6c0b3
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..68f14af6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..435c087a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..47fef5aa
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..1361eedc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..73680649
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..a57e72f7
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..7e9d67f6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..2a27316b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..ea80bc00
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b6dcb0b9
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..f7652e60
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..440070a1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 00000000..ee2f3a43
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..89c1aef2
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..86db9890
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..fe0ae13a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..524cc0a0
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..7caf6c9b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..8fea47f6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..abc5c7a5
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png
diff --git a/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
deleted file mode 100644
index a600118d..00000000
--- a/src/main/res/layout-w360dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
deleted file mode 100644
index c3aa67ae..00000000
--- a/src/main/res/layout-w384dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="345dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
deleted file mode 100644
index 331fb1f0..00000000
--- a/src/main/res/layout-w600dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="400dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
index 64b75f0e..cc5fc9d7 100644
--- a/src/main/res/layout/actionview_search.xml
+++ b/src/main/res/layout/actionview_search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
     android:focusable="true"
@@ -10,10 +10,10 @@
 
     <EditText
         android:id="@+id/search_field"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
         android:inputType="textEmailAddress|textNoSuggestions"
         android:textColor="@color/ondarktext" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index bd76457f..ab0e34eb 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -2,10 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.siacs.conversations.ui.AboutActivity"
     android:background="@color/primarybackground"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -15,6 +11,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:linksClickable="true"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
         android:textColor="@color/primarytext"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"/>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index c33f238f..28d531c2 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -13,7 +13,10 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			android:padding="16dp">
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin">
 
 			<TextView
 				android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 21635208..1254a3ab 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -12,9 +12,12 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="@drawable/infocard_border"
-            android:padding="16dp" >
+            android:padding="@dimen/infocard_padding" >
 
             <QuickContactBadge
                 android:id="@+id/details_contact_badge"
@@ -62,6 +65,13 @@
                         android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
 
+                <Button
+                    android:id="@+id/add_contact_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/add_contact"/>
+
                 <CheckBox
                     android:id="@+id/details_send_presence"
                     android:layout_width="wrap_content"
@@ -96,11 +106,14 @@
             android:id="@+id/details_contact_keys"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="@drawable/infocard_border"
             android:divider="?android:dividerHorizontal"
             android:orientation="vertical"
-            android:padding="8dp"
+            android:padding="@dimen/infocard_padding"
             android:showDividers="middle" >
         </LinearLayout>
     </LinearLayout>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 36987072..750c28e0 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -20,10 +20,13 @@
                 android:id="@+id/editor"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
-                android:padding="16dp">
+                android:padding="@dimen/infocard_padding">
                 <ImageView android:id="@+id/avater"
                     android:layout_width="72dp"
                     android:layout_height="72dp"
@@ -106,10 +109,13 @@
                 android:id="@+id/stats"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:layout_margin="8dp"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
-                android:padding="16dp"
+                android:padding="@dimen/infocard_padding"
                 android:visibility="gone" >
 
                 <TableLayout
@@ -332,7 +338,7 @@
                         android:layout_centerVertical="true"
                         android:background="?android:selectableItemBackground"
                         android:padding="8dp"
-                        android:src="@drawable/ic_action_copy"
+                        android:src="?attr/icon_copy"
                         android:visibility="visible"
                         android:contentDescription="@string/copy_otr_clipboard_description"/>
                 </RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..36873654 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,119 +1,154 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/secondarybackground" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:orientation="vertical"
-        android:padding="16dp" >
-
-        <TextView
-            android:id="@+id/muc_jabberid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/account_settings_example_jabber_id"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeHeadline"
-            android:textStyle="bold"
-            android:layout_marginBottom="16dp"/>
-        
-        <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/your_photo"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_alignParentLeft="true"
-                android:src="@drawable/ic_profile" >
-            </ImageView>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/your_photo"
-                android:orientation="vertical"
-                android:paddingLeft="8dp" >
-
-                <TextView
-                    android:id="@+id/muc_your_nick"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeHeadline" />
-
-                <TextView
-                    android:id="@+id/muc_role"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeBody" />
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/edit_nick_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="?android:selectableItemBackground"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_edit_dark" />
-        </RelativeLayout>
-         <TextView
-                android:id="@+id/details_account"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="32dp"
-                android:text="@string/using_account"
-                android:textColor="@color/secondarytext"
-                android:textSize="?attr/TextSizeInfo" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/muc_more_details"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@drawable/infocard_border"
-        android:orientation="vertical"
-        android:padding="8dp" >
-
-
-            <LinearLayout
-                android:id="@+id/muc_members"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:divider="?android:dividerHorizontal"
-                android:orientation="vertical"
-                android:showDividers="middle" >
-            </LinearLayout>
-
-        <Button
-            android:id="@+id/invite"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="24dp"
-            android:text="@string/invite_contact" />
-    </LinearLayout>
-
-</LinearLayout>
+            android:layout_height="fill_parent"
+            android:background="@color/secondarybackground">
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
+			android:background="@drawable/infocard_border"
+			android:orientation="vertical"
+			android:padding="@dimen/infocard_padding">
+
+			<TextView
+				android:id="@+id/muc_jabberid"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:text="@string/account_settings_example_jabber_id"
+				android:textColor="@color/primarytext"
+				android:textSize="?attr/TextSizeHeadline"
+				android:textStyle="bold"/>
+
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="32dp">
+
+				<ImageView
+					android:id="@+id/your_photo"
+					android:layout_width="48dp"
+					android:layout_height="48dp"
+					android:layout_alignParentLeft="true"
+					android:src="@drawable/ic_profile">
+				</ImageView>
+
+				<LinearLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_centerVertical="true"
+					android:layout_toRightOf="@+id/your_photo"
+					android:orientation="vertical"
+					android:paddingLeft="8dp">
+
+					<TextView
+						android:id="@+id/muc_your_nick"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:singleLine="true"
+						android:textColor="@color/primarytext"
+						android:textSize="?attr/TextSizeHeadline"/>
+
+					<TextView
+						android:id="@+id/muc_role"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:singleLine="true"
+						android:textColor="@color/primarytext"
+						android:textSize="?attr/TextSizeBody"/>
+				</LinearLayout>
+
+				<ImageButton
+					android:id="@+id/edit_nick_button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentRight="true"
+					android:layout_centerVertical="true"
+					android:background="?android:selectableItemBackground"
+					android:padding="8dp"
+					android:src="?attr/icon_edit_dark"/>
+			</RelativeLayout>
+
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+				<TextView
+				android:id="@+id/muc_conference_type"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+			    android:text="@string/private_conference"
+				android:layout_centerVertical="true"
+				android:textColor="@color/primarytext"
+				android:textSize="?attr/TextSizeBody"
+				android:layout_alignParentLeft="true"
+				android:layout_toLeftOf="@+id/change_conference_button"
+				/>
+			<ImageButton
+				android:id="@+id/change_conference_button"
+				style="?android:attr/buttonStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_alignParentRight="true"
+				android:layout_centerVertical="true"
+				android:background="?android:selectableItemBackground"
+				android:padding="8dp"
+				android:src="?attr/icon_settings"/>
+				</RelativeLayout>
+
+			<TextView
+				android:id="@+id/details_account"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right"
+				android:layout_marginTop="32dp"
+				android:text="@string/using_account"
+				android:textColor="@color/secondarytext"
+				android:textSize="?attr/TextSizeInfo"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/muc_more_details"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
+			android:background="@drawable/infocard_border"
+			android:orientation="vertical"
+			android:padding="@dimen/infocard_padding">
+
+
+			<LinearLayout
+				android:id="@+id/muc_members"
+				android:layout_width="fill_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1"
+				android:divider="?android:dividerHorizontal"
+				android:orientation="vertical"
+				android:showDividers="middle">
+			</LinearLayout>
+
+			<Button
+				android:id="@+id/invite"
+				style="?android:attr/buttonStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="24dp"
+				android:text="@string/invite_contact"/>
+		</LinearLayout>
+
+	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index 1a4221bc..54f9a542 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -13,7 +13,10 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			android:padding="16dp">
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin">
 
 			<TextView
 				android:id="@+id/verification_explanation"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7053857f..75572877 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -35,7 +35,7 @@
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="8dp"
-        android:src="@drawable/ic_action_remove"
+        android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index d4145761..69570028 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -5,7 +5,7 @@
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="288dp"
+        android:layout_width="@dimen/conversations_overview_width"
         android:layout_height="match_parent"
         android:background="@color/primarybackground"
         android:orientation="vertical" >
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d5f8bb33..20544cd5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -19,4 +19,17 @@
         android:scaleType="fitXY"
         android:src="@drawable/ic_profile" />
 
+    <TextView
+        android:id="@+id/status_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_toEndOf="@+id/message_photo"
+        android:layout_toRightOf="@+id/message_photo"
+        android:text="@string/contact_has_read_up_to_this_point"
+        android:textColor="@color/secondarytext"
+        android:textSize="?attr/TextSizeInfo"
+        android:textStyle="italic"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..c025d00f 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
 
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ce9028aa..bd81b6d4 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/action_edit_contact"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_contact"/>
     <item
         android:id="@+id/action_delete_contact"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="?attr/icon_discard"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_delete_contact"/>
@@ -17,6 +17,19 @@
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_block"
+        android:orderInCategory="72"
+        android:showAsAction="never"
+        android:title="@string/action_block_contact"/>
+
+    <item
+        android:id="@+id/action_unblock"
+        android:orderInCategory="73"
+        android:showAsAction="never"
+        android:title="@string/action_unblock_contact"/>
+
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 6c22ed18..4c724d27 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -2,19 +2,19 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
     <item
         android:id="@+id/action_security"
-        android:icon="@drawable/ic_action_not_secure"
+        android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         android:showAsAction="always"
         android:title="@string/action_secure"/>
     <item
         android:id="@+id/action_attach_file"
-        android:icon="@drawable/ic_action_new_attachment"
+        android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         android:showAsAction="always"
         android:title="@string/attach_file"/>
@@ -25,7 +25,7 @@
         android:title="@string/action_contact_details"/>
     <item
         android:id="@+id/action_muc_details"
-        android:icon="@drawable/ic_action_group"
+        android:icon="?attr/icon_group"
         android:orderInCategory="40"
         android:showAsAction="ifRoom"
         android:title="@string/action_muc_details"/>
@@ -57,18 +57,6 @@
         android:title="@string/enable_notifications"/>
 
     <item
-        android:id="@+id/action_block"
-        android:orderInCategory="72"
-        android:showAsAction="never"
-        android:title="@string/action_block_contact"/>
-
-    <item
-        android:id="@+id/action_unblock"
-        android:orderInCategory="73"
-        android:showAsAction="never"
-        android:title="@string/action_unblock_contact"/>
-
-    <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
         android:showAsAction="never"
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 5b04484f..f8a30ff7 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@+id/action_add_account"
-		android:icon="@drawable/ic_action_add_person"
+		android:icon="?attr/icon_add_person"
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
 	<item
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 3be52442..21659266 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,8 +5,8 @@
         android:id="@+id/copy_text"
         android:title="@string/copy_text"/>
     <item
-        android:id="@+id/share_image"
-        android:title="@string/share_image"/>
+        android:id="@+id/share_with"
+        android:title="@string/share_with"/>
     <item
         android:id="@+id/copy_url"
         android:title="@string/copy_original_url"/>
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 341d438a..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_edit_subject"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
@@ -21,6 +21,13 @@
         android:title="@string/delete_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never" />
+	<item
+		android:id="@+id/action_advanced_mode"
+		android:title="@string/advanced_mode"
+		android:checkable="true"
+		android:checked="false"
+		android:orderInCategory="85"
+		android:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 113934f3..dc0f5d3e 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -3,5 +3,30 @@
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
-        />
+        android:visible="false" />
+	<item
+		android:id="@+id/give_membership"
+        android:title="@string/grant_membership"
+		android:visible="false" />
+	<item
+		android:id="@+id/give_admin_privileges"
+        android:title="@string/grant_admin_privileges"
+		android:visible="false"/>
+	<item
+		android:id="@+id/remove_admin_privileges"
+        android:title="@string/remove_admin_privileges"
+		android:visible="false"/>
+
+	<item
+		android:id="@+id/remove_membership"
+		android:title="@string/remove_membership"
+		android:visible="false"/>
+	<item
+		android:id="@+id/ban_from_conference"
+	    android:title="@string/ban_from_conference"
+	    android:visible="false" />
+	<item
+		android:id="@+id/remove_from_room"
+        android:title="@string/remove_from_room"
+		android:visible="false"/>
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..bc51f462 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 2c23af59..a89d71ff 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,23 +4,31 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search" />
     <item
         android:id="@+id/action_create_contact"
-        android:icon="@drawable/ic_action_add_person"
+        android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
         android:id="@+id/action_join_conference"
-        android:icon="@drawable/ic_action_add_group"
+        android:icon="?attr/icon_add_group"
         android:showAsAction="always"
         android:title="@string/join_conference" />
     <item
         android:id="@+id/action_scan_qr_code"
         android:showAsAction="never"
         android:title="@string/scan_qr_code" />
+
+    <item
+        android:id="@+id/action_hide_offline"
+        android:checkable="true"
+        android:checked="false"
+        android:orderInCategory="85"
+        android:showAsAction="never"
+        android:title="@string/hide_offline"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/main/res/values-ar-rEG/strings.xml b/src/main/res/values-ar-rEG/strings.xml
new file mode 100644
index 00000000..f81a2ee7
--- /dev/null
+++ b/src/main/res/values-ar-rEG/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">إعدادات</string>
+  <string name="action_add">محادثة جديدة</string>
+  <string name="action_accounts">إدارة الحسابات</string>
+  <string name="action_end_conversation">إنهاء المحادثة</string>
+  <string name="action_contact_details">بيانات جهة الإتصال</string>
+  <string name="action_muc_details">بيانات الغرفة</string>
+  <string name="action_secure">تشفير المحادثة</string>
+  <string name="action_add_account">إضافة حساب</string>
+  <string name="action_edit_contact">تعديل الإسم</string>
+  <string name="action_add_phone_book">إضافة لسجل الهاتف</string>
+  <string name="action_delete_contact">حذف من الإضافات</string>
+  <string name="action_block_contact">حجب جهة إتصال</string>
+  <string name="action_unblock_contact">إنهاء حجب جهة اتصال</string>
+  <string name="action_block_domain">حجب دومين</string>
+  <string name="action_unblock_domain">إنهاء حجب دومين</string>
+  <string name="title_activity_manage_accounts">إدارة الحسابات</string>
+  <string name="title_activity_settings">إعدادات</string>
+  <string name="title_activity_conference_details">بيانات الغرفه</string>
+  <string name="title_activity_contact_details">بيانات جهة الإتصال</string>
+  <string name="title_activity_sharewith">مشاركة مع محادثة</string>
+  <string name="title_activity_start_conversation">بدأ محادثة</string>
+  <string name="title_activity_choose_contact">إختيار جهة اتصال</string>
+  <string name="title_activity_block_list">قائمة المحجوبين</string>
+  <string name="just_now">الآن</string>
+  <string name="minute_ago">منذ 1 دقيقة</string>
+  <string name="minutes_ago">دقائق %d منذ</string>
+  <string name="unread_conversations">محادثات غير مقروءة</string>
+  <string name="sending">ارسال</string>
+  <string name="encrypted_message">رسالة مشفّرة .. الرجاء الإنتظار</string>
+  <string name="nick_in_use">اللقب مستخدم من قبل</string>
+  <string name="admin">مدير</string>
+  <string name="owner">مالك</string>
+  <string name="moderator">مشرف</string>
+  <string name="participant">مشترك</string>
+  <string name="visitor">زائر</string>
+  <string name="remove_contact_text">هل ترغب بحذف جهة الإتصال %s من اضافاتك? ستبقى محادثاتك معه محفوظه</string>
+  <string name="block_contact_text">هل ترغب في حجب %s  من ارسال الرسائل لك?</string>
+  <string name="unblock_contact_text">هل ترغب في انهاء حجب %s والسماح له بمراسلتك?</string>
+  <string name="block_domain_text">هل تريد حجب جميع جهات الإتصال من %s?</string>
+  <string name="unblock_domain_text">الغاء حجب جميع جهات الإتصال من %s?</string>
+  <string name="contact_blocked">جهة الاتصال محجوبه</string>
+  <string name="remove_bookmark_text">هل ترغب في حذف %s من المفضلات? المحادثات المحفوظه ستبقى كما هي</string>
+  <string name="register_account">تسجيل حساب جديد في سيرفر</string>
+  <string name="change_password_on_server">تغيير كلمة المرور في سيرفر</string>
+  <string name="share_with">مشاركة مع</string>
+  <string name="start_conversation">بدأ محادثة</string>
+  <string name="invite_contact">دعوة صديق</string>
+  <string name="contacts">جهات الإتصال</string>
+  <string name="cancel">الغاء</string>
+  <string name="set">تعيين</string>
+  <string name="add">اضافة</string>
+  <string name="edit">تعديل</string>
+  <string name="delete">حذف</string>
+  <string name="block">حجب</string>
+  <string name="unblock">الغاء حجب</string>
+  <string name="save">حفظ</string>
+  <string name="ok">موافق</string>
+  <string name="crash_report_title">توقف التطبيق عن العمل</string>
+  <string name="crash_report_message">بموافقتك على ارسال تقارير الأخطاء ستساعد مبرمجي التطبيق على تحسين جودة التطبيق\n<b>تنويه:</b> سيرسل تقارير الأخطاء ان وجدت بأحد الحسابات التي أضفتها.</string>
+  <string name="send_now">ارسال الآن</string>
+  <string name="send_never">لا تسألني ثانية</string>
+  <string name="problem_connecting_to_account">لا يمكن تسجيل الدخول لحسابك</string>
+  <string name="problem_connecting_to_accounts">لا يمكن تسجيل الدخول بحساباتك</string>
+  <string name="touch_to_fix">المس الشاشه لعرض المحادثات</string>
+  <string name="attach_file">ارفاق ملف</string>
+  <string name="not_in_roster">جهة الاتصال ليست مضافه لديك هل ترغب في إضافتها ؟؟</string>
+  <string name="add_contact">اضافة جهة اتصال</string>
+  <string name="send_failed">فشل التسليم</string>
+  <string name="send_rejected">مرفوض</string>
+  <string name="preparing_image">اعداد صورة للإرسال</string>
+  <string name="action_clear_history">حذف سجل المحفوظات</string>
+  <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
+  <string name="clear_histor_msg">هل ترغب بحذف جميع الرسائل في تلك المحادثة?\n\n<b>تنويه:</b> هذا لن يؤثر على الرسائل المخزنة على الأجهزة أو أي أماكن أخرى.</string>
+  <string name="delete_messages">حذف الرسائل</string>
+  <string name="also_end_conversation">انهاء هذه المحادثة بعد الكلمات</string>
+  <string name="choose_presence">اختيار ظهورك لجهات الإتصال</string>
+  <string name="send_plain_text_message">ارسال رسالة غير مشفّرة</string>
+  <string name="send_otr_message">OTRارساله رساله مشفره عبر</string>
+  <string name="send_pgp_message">OpenPGPارساله رساله مشفره عبر</string>
+  <string name="your_nick_has_been_changed">تم تغيير لقبك بنجاح</string>
+  <string name="download_image">تنزيل الصورة</string>
+  <string name="send_unencrypted">إرسال بدون تشفير</string>
+  <string name="decryption_failed">فشل فك التشفير. ربما لم يكن لديك المفتاح الخاص الصحيح.</string>
+  <string name="restart">اعادة تشغيل</string>
+  <string name="install">تثبيت</string>
+  <string name="offering">عرض ..</string>
+  <string name="waiting">انتظار ..</string>
+  <string name="no_pgp_key">OpenPGP-لايوجد مفتاح</string>
+  <string name="no_pgp_keys">OpenPGP-لايوجد مفاتيح</string>
+  <string name="encrypted_message_received"><i>تلقيت رساله مشفّرة .. لمسه بأناملك لعرضها.</i></string>
+  <string name="pref_general">عام</string>
+  <string name="pref_xmpp_resource">الريسورس</string>
+  <string name="pref_accept_files">ضبط استقبال الملفات</string>
+  <string name="pref_accept_files_summary">اقبل تلقائيا الملفات أقل من</string>
+  <string name="pref_notification_settings">اعدادات الإشعارات</string>
+  <string name="pref_notifications">الإشعارات</string>
+  <string name="pref_notifications_summary">أخبرني عندما تصل رساله جديده</string>
+  <string name="pref_vibrate">إعداد الإهتزاز</string>
+  <string name="pref_vibrate_summary">تفعيل الاهتزاز عندما تصل رساله جديده</string>
+  <string name="pref_sound">التبيه الصوتي</string>
+  <string name="pref_sound_summary">سماع صوت عندما تصل رساله</string>
+  <string name="pref_conference_notifications">الاشعارات من الغرف</string>
+  <string name="pref_advanced_options">اعدادات متقدمّة</string>
+  <string name="pref_never_send_crash">لا ترسل تقارير أخطاء</string>
+  <string name="pref_never_send_crash_summary">الغاء ارسال تقارير الأخطاء يقلل من فرص حل المشكلة سريعا فكن متعاون</string>
+  <string name="accept">قبول</string>
+  <string name="error">حدث خطأ ما</string>
+  <string name="pref_grant_presence_updates">منح تحديثات الظهور</string>
+  <string name="pref_grant_presence_updates_summary">اسأل واقبل السؤال عن تحديثات الظهور</string>
+  <string name="your_account">حسابك</string>
+  <string name="keys">مفاتيح</string>
+  <string name="send_presence_updates">ارسال تحديثات الظهور</string>
+  <string name="pref_keep_foreground_service_summary">منع نظام التشغيل من انهاء اتصالك</string>
+  <string name="choose_file">اختيار ملف</string>
+  <string name="receiving_x_file">اكتمل الإستلام %1$s (%2$d%% بنسبة)</string>
+  <string name="download_x_file">تنزيل %s</string>
+  <string name="file">ملف</string>
+  <string name="open_x_file">فتح %s</string>
+  <string name="sending_file">إكتمل الإرسال (%1$d%% بنسبة)</string>
+  <string name="preparing_file">إعداد ارسال الملفات</string>
+  <string name="x_file_offered_for_download">%s عرض وتنزيل</string>
+  <string name="cancel_transmission">الغاء الارسال</string>
+  <string name="file_transmission_failed">تعذر ارسال الملف</string>
+  <string name="file_deleted">تم مسح الملف</string>
+  <string name="no_application_found_to_open_file">لا يوجد تطبيق متاح لعرض الملف</string>
+  <string name="could_not_verify_fingerprint">لا يمكن التحقق من البصمة</string>
+  <string name="manually_verify">تأكيد يدوي</string>
+  <string name="are_you_sure_verify_fingerprint">هل ترغب في تأكيد بصمات OTR لجهات اتصالك ؟</string>
+  <string name="pref_show_dynamic_tags">عرض العلامات التلقائية</string>
+  <string name="pref_show_dynamic_tags_summary">عرض العلامات  للقراءة فقط أسفل بيانات جهات الإتصال </string>
+  <string name="enable_notifications">تفعيل الإشعارات</string>
+  <string name="conference_with">انشاء غرفة بــ </string>
+  <string name="no_conference_server_found">سيرفر الغرف غير موجود</string>
+  <string name="conference_creation_failed">فشل انشاء الغرفة</string>
+  <string name="conference_created">تم انشاء الرغرفة بنجاح</string>
+  <string name="secret_accepted">الاجابة السريّة مقبولة</string>
+  <string name="reset">إعادة تعيين</string>
+  <string name="account_image_description">الصورة الرمزية للحساب</string>
+  <string name="copy_otr_clipboard_description">نسخ OTR بصمات الأصابع إلى الحافظة</string>
+  <string name="fetching_history_from_server">جلب المحفوظات من السرفر</string>
+  <string name="no_more_history_on_server">لا مزيد من المحفوظات بالسرفر</string>
+  <string name="updating">جاري التحديث..</string>
+  <string name="password_changed">تم تغيير كلمة السر!</string>
+  <string name="could_not_change_password">لايمكن تغيير كلمة السر</string>
+  <string name="otr_session_not_started">ارسل رساله لبدأ محادثة مشفّرة</string>
+  <string name="ask_question">أسال سؤال</string>
+  <string name="smp_explain_question">إذا كنت و جهة اتصالك لديكم سر مشترك غير معروف لأحد آخر (مثل جملة مكرره بينكم او تاريخ ما يخصكم  كتاريخ آخر لقاء بينكم ) استخدماه للتحقق من بصمات الأصابع  \n\n عليك توفير تلميحا أو سؤال لجهة الإتصال بك للحصول على تلك الإجابه وبدأ التواصل</string>
+  <string name="smp_explain_answer">سترغب جهة الإتصال بتأكيد بصمتك عبر السر المشترك بينكما لذلك أخبره تلميحا أو إسأله سؤالا يذكره بالسر ليكتبه برده</string>
+  <string name="shared_secret_hint_should_not_be_empty">التلميح الذي يراه صديقك لا يمكن ان يكون فارغ</string>
+  <string name="shared_secret_can_not_be_empty">السر المشترك بينكما لا يمكن ان يترك فارغا !!</string>
+  <string name="manual_verification_explanation">بعناية قارن بين بصمتك المعروضه أدناه وبصمة جهات اتصالك\n يمكنك استخدام أي شكل موثوق به للاتصال مثل بريد إلكتروني مشفر أو مكالمة هاتفية لتبادلها.</string>
+  <string name="change_password">تغيير كلمة المرور</string>
+  <string name="current_password">كلمة المرور الحالية</string>
+  <string name="new_password">كلمة مرور جديدة</string>
+  <string name="password_should_not_be_empty">كلمة المرور لا يمكن ان تبقى فارغة</string>
+  <string name="enable_all_accounts">تفعيل كل الحسابات</string>
+  <string name="disable_all_accounts">تعطيل كل الحسابات</string>
+  <string name="perform_action_with">تنفيذ الإجراء مع</string>
+  <string name="no_affiliation">زائر</string>
+  <string name="no_role">لا دور</string>
+  <string name="outcast">مفصول</string>
+  <string name="member">عضو</string>
+  <string name="advanced_mode">الوضع المتقدم</string>
+  <string name="grant_membership">منح عضوية</string>
+  <string name="remove_membership">إلغاء عضوية</string>
+  <string name="grant_admin_privileges">منح امتيازات الإداره</string>
+  <string name="remove_admin_privileges">إلغاء امتيازات الإدارة</string>
+  <string name="remove_from_room">إزالة من الغرفة</string>
+  <string name="could_not_change_affiliation">لا يمكن تغيير انتساب %s</string>
+  <string name="ban_from_conference">حظر من الغرفة</string>
+  <string name="removing_from_public_conference">تحاول انهاء تواجد %s الغرفه. سيتم فصله</string>
+  <string name="ban_now">حظر الآن</string>
+  <string name="could_not_change_role">لا يمكن تغيير دول %s</string>
+  <string name="public_conference">الوصول العام للغرفة</string>
+  <string name="private_conference">الخاص , اعضاء الغرفة فقط</string>
+  <string name="conference_options">اعدادت المؤتمر</string>
+  <string name="members_only">الخاص (الأعضاء فقط)</string>
+  <string name="non_anonymous">لا تسمح للمجهولين بالدخول</string>
+  <string name="modified_conference_options">تم تعديل اعدادات المؤتمر!</string>
+  <string name="could_not_modify_conference_options">لا يمكن تعديل اعدادات المؤتمر</string>
+  <string name="never">أبداً</string>
+  <string name="thirty_minutes">30 دقيقة</string>
+  <string name="one_hour">ساعة</string>
+  <string name="two_hours">ساعتين</string>
+  <string name="eight_hours">8 ساعات</string>
+  <string name="until_further_notice">حتى إشعار آخر</string>
+  <string name="pref_input_options">خيارات الادخال</string>
+  <string name="pref_enter_is_send">أدخل للإرسال</string>
+  <string name="pref_enter_is_send_summary">استخدام مفتاح الدخول لإرسال رسالة</string>
+  <string name="pref_display_enter_key">عرض مفتاح الادخال</string>
+  <string name="pref_display_enter_key_summary">تغيير مفتاح الرموز إلى مفتاح الدخول</string>
+  <string name="audio">صوت</string>
+  <string name="video">فيديو</string>
+  <string name="image">صورة</string>
+  <string name="pdf_document">مستند PDF</string>
+  <string name="apk">تطبيق اندرويد</string>
+  <string name="vcard">تواصل</string>
+  <string name="received_x_file">تم التلقي %s</string>
+  <string name="disable_foreground_service">ايقاف عرض تنويهات الخدمات على رئيسية الهاتف</string>
+  <string name="touch_to_open_conversations">ألمس لفتح المحادثات</string>
+  <string name="avatar_has_been_published">تم نشر الصورة!</string>
+  <string name="sending_x_file">ارسال %s</string>
+  <string name="offering_x_file">عرض %s</string>
+</resources>
diff --git a/src/main/res/values-ar-rSY/strings.xml b/src/main/res/values-ar-rSY/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/src/main/res/values-ar-rSY/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/src/main/res/values-ar/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-ca-rES/strings.xml b/src/main/res/values-ca-rES/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/src/main/res/values-ca-rES/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml
deleted file mode 100644
index ff1a0d4b..00000000
--- a/src/main/res/values-ca/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mòbil</item>
-        <item>Telèfon</item>
-        <item>Tauleta</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>mai</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index ae1da472..c178283e 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -1,82 +1,419 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Preferències</string>
-    <string name="action_add">Nova conversa</string>
-    <string name="action_accounts">Gestionar comptes</string>
-    <string name="action_end_conversation">Finalitzar conversa</string>
-    <string name="action_contact_details">Detalls del contacte</string>
-    <string name="action_muc_details">Detalls de la conferència</string>
-    <string name="action_secure">Conversa segura</string>
-    <string name="action_add_account">Afegir compte</string>
-    <string name="just_now">ara</string>
-    <string name="sending">enviant&#8230;</string>
-    <string name="encrypted_message">Desxifrant missatge. Espera si us plau&#8230;</string>
-    <string name="nick_in_use">El sobrenom ja està en ús</string>
-    <string name="moderator">Moderador</string>
-    <string name="participant">Participant</string>
-    <string name="visitor">Visitant</string>
-    <string name="remove_contact_text">Vols eliminar a %s de la teva llista?. La conversa associada a aquest compte no s\'eliminarà.</string>
-    <string name="register_account">Registrar nou compte al servidor</string>
-    <string name="share_with">Compartir amb</string>
-    <string name="start_conversation">Començar conversa</string>
-    <string name="cancel">Cancel·lar</string>
-    <string name="crash_report_title">Conversations s\'ha aturat.</string>
-    <string name="crash_report_message">Enviant bolcats de piles ajudes al desenvolupament de Conversations\n<b>Avís:</b> Això usarà el teu compte XMPP per enviar el bolcat de pila al desenvolupador.</string>
-    <string name="send_now">Enviar ara</string>
-    <string name="send_never">No preguntar de nou</string>
-    <string name="problem_connecting_to_account">No s\'ha pogut connectar al compte</string>
-    <string name="problem_connecting_to_accounts">No s\'ha pogut connectar a múltiples comptes</string>
-    <string name="touch_to_fix">Prem aqui per gestionar els teus comptes</string>
-    <string name="attach_file">Enviar arxiu</string>
-    <string name="not_in_roster">El contacte no està a la teva llista. Vols afegir-lo?</string>
-    <string name="add_contact">Afefgir contacte</string>
-    <string name="send_failed">Error a l\'enviar</string>
-    <string name="send_rejected">rebutjat</string>
-    <string name="receiving_image">Rebent arxiu d\'imatge. Espera si us plau&#8230;</string>
-    <string name="preparing_image">Preparant imatge per enviar</string>
-    <string name="action_clear_history">Netejar historial</string>
-    <string name="clear_conversation_history">Netejar historial de conversa</string>
-    <string name="clear_histor_msg">Vols esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
-    <string name="delete_messages">Esborrar missatges</string>
-    <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string>
-    <string name="choose_presence">Selecciona recurs del contacte</string>
-    <string name="send_plain_text_message">Enviar missatge de text</string>
-    <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
-    <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
-    <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
-    <string name="download_image">Descarregar imatge</string>
-    <string name="image_offered_for_download"><i>Fitxer d\'imatge ofert per a descàrrega</i></string>
-    <string name="send_unencrypted">Enviar sense xifrar</string>
-    <string name="decryption_failed">Ha fallat el desxiframent. Potser no tinguis la clau privada apropiada.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations utilitza una aplicació de tercers anomenada <b>OpenKeychain</b> per xifrar i desxifrar missatges i gestionar les teves claus públiques..\n\nOpenKeychain està publicat sota llicència GPLv3 i disponible a la F-Droid i Google Play.\n\n<small>(Si us plau, reinicieu Conversations després.)</small></string>
-    <string name="restart">Reiniciar</string>
-    <string name="install">Instal·lar</string>
-    <string name="offering">oferint&#8230;</string>
-    <string name="no_pgp_key">Clau OpenPGP no trobada</string>
-    <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
-    <string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
-    <string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
-    <string name="pref_xmpp_resource">Recursos XMPP</string>
-    <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
-    <string name="pref_accept_files">Acceptar fitxers</string>
-    <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
-    <string name="pref_notification_settings">Ajustos de notificacions</string>
-    <string name="pref_notifications">Notificacions</string>
-    <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
-    <string name="pref_vibrate">Vibra</string>
-    <string name="pref_vibrate_summary">Vibra quan arriba un nou missatge</string>
-    <string name="pref_sound">So</string>
-    <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string>
-    <string name="pref_conference_notifications">Notificacions de conferència</string>
-    <string name="pref_conference_notifications_summary">Sempre notifica quan arriba un nou missatge de conferència en comptes de només quan està destacat</string>
-    <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
-    <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
-    <string name="pref_advanced_options">Opcions avançades</string>
-    <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
-    <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
-    <string name="pref_ui_options">Opcions de UI</string>
-
+  <string name="action_settings">Preferències</string>
+  <string name="action_add">Nova conversa</string>
+  <string name="action_accounts">Gestionar comptes</string>
+  <string name="action_end_conversation">Finalitzar conversa</string>
+  <string name="action_contact_details">Detalls del contacte</string>
+  <string name="action_muc_details">Detalls de la conferència</string>
+  <string name="action_secure">Conversa segura</string>
+  <string name="action_add_account">Afegir compte</string>
+  <string name="action_edit_contact">Edita el nom</string>
+  <string name="action_add_phone_book">Afegir a l\'agenda</string>
+  <string name="action_delete_contact">Elimina de la llista de contactes</string>
+  <string name="action_block_contact">Bloqueja contacte</string>
+  <string name="action_unblock_contact">Desbloqueja contacte</string>
+  <string name="action_block_domain">Bloqueja el domini</string>
+  <string name="action_unblock_domain">Desbloqueja aquest domini</string>
+  <string name="title_activity_manage_accounts">Administrar comptes</string>
+  <string name="title_activity_settings">Configuració</string>
+  <string name="title_activity_conference_details">Detalls de la conferència o Detalls de la sala</string>
+  <string name="title_activity_contact_details">Detalls del contacte</string>
+  <string name="title_activity_sharewith">Compartir amb converses</string>
+  <string name="title_activity_start_conversation">Començar una conversa</string>
+  <string name="title_activity_choose_contact">Escollir un contacte</string>
+  <string name="title_activity_block_list">LLista bloqueix</string>
+  <string name="just_now">ara</string>
+  <string name="minute_ago">1 min avans</string>
+  <string name="minutes_ago">%de minuts avans</string>
+  <string name="unread_conversations">Converses sense llegir o no llegides</string>
+  <string name="sending">enviant…</string>
+  <string name="encrypted_message">Desxifrant missatge. Espera si us plau…</string>
+  <string name="nick_in_use">El sobrenom ja està en ús</string>
+  <string name="admin">Administrador</string>
+  <string name="owner">Propietari</string>
+  <string name="moderator">Moderador</string>
+  <string name="participant">Participant</string>
+  <string name="visitor">Visitant</string>
+  <string name="remove_contact_text">Vols eliminar a %s de la teva llista?. La conversa associada a aquest compte no s\'eliminarà.</string>
+  <string name="block_contact_text">Li agradaria bloquejar %s i no podrà enviar missatges? </string>
+  <string name="unblock_contact_text">L\'hi agradaria desbloquejar %s i permetre\'ls enviar-vos missatges?</string>
+  <string name="block_domain_text">Bloqueja tots els teus contactes des de %s?</string>
+  <string name="unblock_domain_text">Desbloqueja tots el contactes des de %s?</string>
+  <string name="contact_blocked">Contacte bloquejat</string>
+  <string name="remove_bookmark_text">L\'hi agradaria eliminar %s de favorits?? La conversació associada amb aquesta llista de favorits no serà eliminada.</string>
+  <string name="register_account">Registrar nou compte al servidor</string>
+  <string name="change_password_on_server">Canviar la contrasenya del servidor</string>
+  <string name="share_with">Compartir amb</string>
+  <string name="start_conversation">Començar conversa</string>
+  <string name="invite_contact">Invitar a un contacte</string>
+  <string name="contacts">Contactes</string>
+  <string name="cancel">Cancel·lar</string>
+  <string name="set">Conjunt</string>
+  <string name="add">Afegir</string>
+  <string name="edit">Editar</string>
+  <string name="delete">Eliminar</string>
+  <string name="block">Bloquejar</string>
+  <string name="unblock">Desbloquejar</string>
+  <string name="save">Salvar</string>
+  <string name="ok">D\'acord</string>
+  <string name="crash_report_title">Conversations s\'ha aturat.</string>
+  <string name="crash_report_message">Enviant bolcats de piles ajudes al desenvolupament de Conversations\n<b>Avís:</b> Això usarà el teu compte XMPP per enviar el bolcat de pila al desenvolupador.</string>
+  <string name="send_now">Enviar ara</string>
+  <string name="send_never">No preguntar de nou</string>
+  <string name="problem_connecting_to_account">No s\'ha pogut connectar al compte</string>
+  <string name="problem_connecting_to_accounts">No s\'ha pogut connectar a múltiples comptes</string>
+  <string name="touch_to_fix">Prem aqui per gestionar els teus comptes</string>
+  <string name="attach_file">Enviar arxiu</string>
+  <string name="not_in_roster">El contacte no està a la teva llista. Vols afegir-lo?</string>
+  <string name="add_contact">Afefgir contacte</string>
+  <string name="send_failed">Error a l\'enviar</string>
+  <string name="send_rejected">rebutjat</string>
+  <string name="preparing_image">Preparant imatge per enviar</string>
+  <string name="action_clear_history">Netejar historial</string>
+  <string name="clear_conversation_history">Netejar historial de conversa</string>
+  <string name="clear_histor_msg">Vols esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
+  <string name="delete_messages">Esborrar missatges</string>
+  <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string>
+  <string name="choose_presence">Selecciona recurs del contacte</string>
+  <string name="send_plain_text_message">Enviar missatge de text</string>
+  <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
+  <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
+  <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
+  <string name="download_image">Descarregar imatge</string>
+  <string name="send_unencrypted">Enviar sense xifrar</string>
+  <string name="decryption_failed">Ha fallat el desxiframent. Potser no tinguis la clau privada apropiada.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations utilitza una aplicació de tercers anomenada <b>OpenKeychain</b> per xifrar i desxifrar missatges i gestionar les teves claus públiques..\n\nOpenKeychain està publicat sota llicència GPLv3 i disponible a la F-Droid i Google Play.\n\n<small>(Si us plau, reinicieu Conversations després.)</small></string>
+  <string name="restart">Reiniciar</string>
+  <string name="install">Instal·lar</string>
+  <string name="offering">oferint…</string>
+  <string name="waiting">Esperant...</string>
+  <string name="no_pgp_key">Clau OpenPGP no trobada</string>
+  <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
+  <string name="no_pgp_keys">No hi ha claus OPENPGP trobades</string>
+  <string name="contacts_have_no_pgp_keys">Coversations no és possible xifrar les teves converses perquè els teus contactes no han mostrat la seva clau pública.\n\n<small> Si us plau, pregunti als seus contactes per configurar OpenPGP .</small></string>
+  <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
+  <string name="pref_general">General</string>
+  <string name="pref_xmpp_resource">Recursos XMPP</string>
+  <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
+  <string name="pref_accept_files">Acceptar fitxers</string>
+  <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string>
+  <string name="pref_notification_settings">Ajustos de notificacions</string>
+  <string name="pref_notifications">Notificacions</string>
+  <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
+  <string name="pref_vibrate">Vibra</string>
+  <string name="pref_vibrate_summary">Vibra quan arriba un nou missatge</string>
+  <string name="pref_sound">So</string>
+  <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string>
+  <string name="pref_conference_notifications">Notificacions de conferència</string>
+  <string name="pref_conference_notifications_summary">Sempre notifica quan arriba un nou missatge de conferència en comptes de només quan està destacat</string>
+  <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
+  <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
+  <string name="pref_advanced_options">Opcions avançades</string>
+  <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
+  <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
+  <string name="pref_confirm_messages">Confirmant missatges</string>
+  <string name="pref_confirm_messages_summary">Deixeu que el seu contacte sápiga quan heu rebut i llegit un missatge</string>
+  <string name="pref_ui_options">Opcions de UI</string>
+  <string name="openpgp_error">OpenKeychain ha reportat un error</string>
+  <string name="error_decrypting_file">I/O Error al desxifrar un arxiu</string>
+  <string name="accept">Acceptar</string>
+  <string name="error">Un error ha passat</string>
+  <string name="pref_grant_presence_updates">Concedir actualitzacions</string>
+  <string name="pref_grant_presence_updates_summary">Preventivament atorgar i preguntar per les subscripcions als contactes creats</string>
+  <string name="subscriptions">Subscripcions</string>
+  <string name="your_account">La teva compte</string>
+  <string name="keys">Claus</string>
+  <string name="send_presence_updates">Enviar actualitzacions</string>
+  <string name="receive_presence_updates">Rebre actualitzacions</string>
+  <string name="ask_for_presence_updates">Preguntar per les actualizacions</string>
+  <string name="attach_choose_picture">Escollir una imatge</string>
+  <string name="attach_take_picture">Fer una fotografia</string>
+  <string name="preemptively_grant">Preventivament otorgar una petició a la subscripció</string>
+  <string name="error_not_an_image_file">L\'arxiu que has seleccionat no és una imatge</string>
+  <string name="error_compressing_image">Error mentrés s\'intentaba convertir l\'imatge de l\'arxiu</string>
+  <string name="error_file_not_found">Arxiu no trobat</string>
+  <string name="error_io_exception">Error general I/O. Potser és troba sense espai d\'emmagatzematge?</string>
+  <string name="error_security_exception_during_image_copy">L\'aplicació què está utilitzan per seleccionar l\'imatge no conté els suficients permissos per llegir l\'arxiu.\n\n<small> Utilitzeu un gestor de fitxers diferent per escollir una imatge.</small></string>
+  <string name="account_status_unknown">Desconegut</string>
+  <string name="account_status_disabled">Temporalment deshabilitat</string>
+  <string name="account_status_online">En línia</string>
+  <string name="account_status_connecting">Connectant \u2026</string>
+  <string name="account_status_offline">Fora de línia</string>
+  <string name="account_status_unauthorized">No autoritzat</string>
+  <string name="account_status_not_found">Servidor no trobat</string>
+  <string name="account_status_no_internet">Sense connectivitat</string>
+  <string name="account_status_regis_fail">Registre fallat</string>
+  <string name="account_status_regis_conflict">El seu nom d\'usuari ja està en ús</string>
+  <string name="account_status_regis_success">Registre completat</string>
+  <string name="account_status_regis_not_sup">El servidor no admet el registre</string>
+  <string name="account_status_security_error">Error de seguretat</string>
+  <string name="account_status_incompatible_server">Servidor incompatible</string>
+  <string name="encryption_choice_none">Text pla</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Edita compte</string>
+  <string name="mgmt_account_delete">Eliminar compte</string>
+  <string name="mgmt_account_disable">Temporalment deshabilitat</string>
+  <string name="mgmt_account_publish_avatar">Publicar avatar</string>
+  <string name="mgmt_account_publish_pgp">Publicar clau OpenPGP pública</string>
+  <string name="mgmt_account_enable">Habilitar compte</string>
+  <string name="mgmt_account_are_you_sure">Estàs segur?</string>
+  <string name="mgmt_account_delete_confirm_text">Si vosté elimina el  seu compte tot el seu historial de les conversacions és perdràn</string>
+  <string name="attach_record_voice">Registre de veu</string>
+  <string name="account_settings_jabber_id">Identificació de Jabber</string>
+  <string name="account_settings_password">Contrasenya</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">Confirma la contrasenya</string>
+  <string name="password">Contrasenya</string>
+  <string name="confirm_password">Confirmar contrasenya</string>
+  <string name="passwords_do_not_match">Contrasenyes no coincideixen</string>
+  <string name="invalid_jid">Aquesta identificació de Jabber no és vàlida</string>
+  <string name="error_out_of_memory">Fora de la capacitat de la mèmoria. L\'imatge és massa gran</string>
+  <string name="add_phone_book_text">Voleu afegir %s a la teva llista de contactes del telèfon?</string>
+  <string name="contact_status_online">En línia</string>
+  <string name="contact_status_free_to_chat">Lliure per xatejar</string>
+  <string name="contact_status_away">Fora</string>
+  <string name="contact_status_extended_away">Lluny</string>
+  <string name="contact_status_do_not_disturb">No molestar</string>
+  <string name="contact_status_offline">Fora de línia</string>
+  <string name="muc_details_conference">Sala</string>
+  <string name="muc_details_other_members">Altres membres</string>
+  <string name="server_info_show_more">Informació del servidor</string>
+  <string name="server_info_mam">XEP-0313:MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Missatge de Carbons</string>
+  <string name="server_info_csi">XEP-0352: Indicació de l\'estat del client</string>
+  <string name="server_info_blocking">XEP-0191: Ordre de bloqueix</string>
+  <string name="server_info_roster_version">XEP-0237: Plantilla de les versions</string>
+  <string name="server_info_stream_management">XEP-0198: Gestió de la transmissió</string>
+  <string name="server_info_pep">XEP-0163: PEP(Avatars)</string>
+  <string name="server_info_available">Disponible</string>
+  <string name="server_info_unavailable">No disponible</string>
+  <string name="missing_public_keys">Clau pública d\'invitació perduda</string>
+  <string name="last_seen_now">Vist per última vegada ara</string>
+  <string name="last_seen_min">Vist per última vegada fa 1 minut</string>
+  <string name="last_seen_mins">Vist per última vegada %d minuts avans</string>
+  <string name="last_seen_hour">Vist per última vegada fa 1 hora</string>
+  <string name="last_seen_hours">Vist per última vegada %d hores avans</string>
+  <string name="last_seen_day">Vist per última vegada 1 dia avans</string>
+  <string name="last_seen_days">Vist per última vegada %d dies avans</string>
+  <string name="never_seen">Mai vist</string>
+  <string name="install_openkeychain">Missatge xifrat. Si us plau instal.la OpenKeychain per desxifrar-lo</string>
+  <string name="unknown_otr_fingerprint">Empremta dactilar OTR desconeguda</string>
+  <string name="openpgp_messages_found">Missatges xifrats OpenPGP trobats</string>
+  <string name="reception_failed">Recepció fallida</string>
+  <string name="your_fingerprint">La teva empremta dactilar</string>
+  <string name="otr_fingerprint">Empremta dactilar OTR</string>
+  <string name="verify">Verificar</string>
+  <string name="decrypt">Desxifrar</string>
+  <string name="conferences">Sales</string>
+  <string name="search">Cercar</string>
+  <string name="create_contact">Crear contacte</string>
+  <string name="join_conference">Unir-se a la sala</string>
+  <string name="delete_contact">Eliminar contacte</string>
+  <string name="view_contact_details">Veure els detalls dels contactes</string>
+  <string name="block_contact">Bloqueja contacte</string>
+  <string name="unblock_contact">Desbloqueja contacte</string>
+  <string name="create">Crear</string>
+  <string name="contact_already_exists">El contacte ja existeix</string>
+  <string name="join">Unir-se</string>
+  <string name="conference_address">Direcció de la sala</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">Guardar com a favorits</string>
+  <string name="delete_bookmark">Eliminar de favorits</string>
+  <string name="bookmark_already_exists">Aquesta llista de favorits ja existeix</string>
+  <string name="you">Tu</string>
+  <string name="action_edit_subject">Editar el tema de la sala</string>
+  <string name="conference_not_found">Sala no trobada</string>
+  <string name="leave">Sortir</string>
+  <string name="contact_added_you">Afegir un contacte a la llista de contactes</string>
+  <string name="add_back">Afegir nou</string>
+  <string name="contact_has_read_up_to_this_point">%s ha llegit fins aquest punt</string>
+  <string name="publish">Publicar</string>
+  <string name="touch_to_choose_picture">Tocar avatar per seleccionar imatge de la  galeria</string>
+  <string name="publish_avatar_explanation">Nota: Tots els que estàn subscripts a les actualitzacions sel\'s permetrà veure l\'avatar </string>
+  <string name="publishing">Publicant...</string>
+  <string name="error_publish_avatar_server_reject">El servidor ha rebutjat la seva publicació</string>
+  <string name="error_publish_avatar_converting">Hi va haver un error durant la conversió de l\'imatge</string>
+  <string name="error_saving_avatar">No és va poder desar l\'avatar al seu disc.</string>
+  <string name="or_long_press_for_default">( O Pulsació llarga per tornar enrere per defecte)</string>
+  <string name="error_publish_avatar_no_server_support">El teu servidor no soporta la publicació dels avatars</string>
+  <string name="private_message">xiuxiuejat</string>
+  <string name="private_message_to">a %s</string>
+  <string name="send_private_message_to">Enviat missatge privat a %s</string>
+  <string name="connect">Connectat</string>
+  <string name="account_already_exists">Aquest compte ja existeix</string>
+  <string name="next">Següent</string>
+  <string name="server_info_session_established">Sessió actual establerta</string>
+  <string name="additional_information">Informació adicional</string>
+  <string name="skip">Saltar</string>
+  <string name="disable_notifications">Deshabilitar notificacions</string>
+  <string name="disable_notifications_for_this_conversation">Deshabilitar notificacions per aquesta conversació</string>
+  <string name="notifications_disabled">Les notificacions estàn deshabilitades</string>
+  <string name="enable">Habilitat</string>
+  <string name="conference_requires_password">La sala requereix una contrasenya</string>
+  <string name="enter_password">Introduir-ho la contrasenya</string>
+  <string name="missing_presence_updates">Perdut les actualitzacions del contacte</string>
+  <string name="request_presence_updates">Si us plau, sol.liciteu les actualitzacions de presència del primer contacte.\n\n<small>.S\'utlitza per determinar quins client(s) ésta utilitzant el vostre contacte.</small></string>
+  <string name="request_now">Sol.licita ara</string>
+  <string name="delete_fingerprint">Eliminar l\'empremta dactilar</string>
+  <string name="sure_delete_fingerprint">Estàs segur que t\'agradaria eliminar l\'empremta dactilar?</string>
+  <string name="ignore">Ignorar</string>
+  <string name="without_mutual_presence_updates"><b>Perill:</b>L\'ennviament d\'aquest sense actualitzacions de presència podria causar problemes inesperats.\n\n<small> Ves als detalls del contacte per verificar les subscripcions de presència.</small></string>
+  <string name="pref_encryption_settings">Configuració del xifratge</string>
+  <string name="pref_force_encryption">Força d\'extrema extrem del xifrat</string>
+  <string name="pref_force_encryption_summary">Enviar sempre missatges xifrat( Excepte per les sales)</string>
+  <string name="pref_dont_save_encrypted">No guardar els misstages xifrats</string>
+  <string name="pref_dont_save_encrypted_summary">Perill: Podria portar a la pèrdua dels missatges</string>
+  <string name="pref_expert_options">Opcions per a experts</string>
+  <string name="pref_expert_options_summary">Aneu amb cura amb aixó</string>
+  <string name="title_activity_about">Sobre Conversations</string>
+  <string name="pref_about_conversations_summary">Informació sobre la construció i la seva llicència</string>
+  <string name="title_pref_quiet_hours">Hores de silenci</string>
+  <string name="title_pref_quiet_hours_start_time">Hora d\'inici</string>
+  <string name="title_pref_quiet_hours_end_time">Hora de finalització</string>
+  <string name="title_pref_enable_quiet_hours">Habilitar hores de silenci</string>
+  <string name="pref_quiet_hours_summary">Les notificacions seràn silenciades a les hores de silenci</string>
+  <string name="pref_use_larger_font">Augmentar el tamany de la lletra</string>
+  <string name="pref_use_larger_font_summary">Utilitzar la mida més gran de les lletres per a tota l\'aplicació</string>
+  <string name="pref_use_send_button_to_indicate_status">Botó d\'indicació de l\'estatus enviar</string>
+  <string name="pref_use_indicate_received">Rebuts de sol.licituds de missatges</string>
+  <string name="pref_use_indicate_received_summary">Els missatges rebuts seràn marcats amb uns ticks verds si ho admet</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Pintar el botó d\'enviament per indicar l\'estatus del contacte</string>
+  <string name="pref_expert_options_other">Altres</string>
+  <string name="pref_conference_name">Nom de la sala</string>
+  <string name="pref_conference_name_summary">Utilitzar el tema de la sala en menys de la identificació de Jabber per identificar les sales</string>
+  <string name="toast_message_otr_fingerprint">Empremta dactilar OTR copiada al portapapers</string>
+  <string name="conference_banned">La teva admissió en aquesta sala ha sigut bloquejada</string>
+  <string name="conference_members_only">La sala es nomès per membres</string>
+  <string name="conference_kicked">Estàs expulsat d\'aquesta sala</string>
+  <string name="using_account">Utlitzant el compte %s</string>
+  <string name="checking_image">Comprovant l\'imatge en el client HTTP</string>
+  <string name="image_file_deleted">L\'arxiu de l\'imatge ha sigut eliminada</string>
+  <string name="not_connected_try_again">No estàs connectat. Intenta-ho més tard</string>
+  <string name="check_image_filesize">Comprobant el tamany de l\'imatge</string>
+  <string name="message_options">Opcions del missatge</string>
+  <string name="copy_text">Copiar el text</string>
+  <string name="copy_original_url">Copiar la URL original</string>
+  <string name="send_again">Envia una altra vegada</string>
+  <string name="image_url">Imatge URL</string>
+  <string name="message_text">Missatge de text</string>
+  <string name="url_copied_to_clipboard">URL copiada al portapapers</string>
+  <string name="message_copied_to_clipboard">Missatge copiat al portapapers</string>
+  <string name="image_transmission_failed">Transmissió de l\'imatge fallada</string>
+  <string name="scan_qr_code">Escanejar el codi QR</string>
+  <string name="show_qr_code">Mostrar el codi QR</string>
+  <string name="show_block_list">Mostra la llista de bloqueig</string>
+  <string name="account_details">Detalls del compte</string>
+  <string name="verify_otr">Verificar OTR</string>
+  <string name="remote_fingerprint">Empremta dactilar remota</string>
+  <string name="scan">Escanejar</string>
+  <string name="or_touch_phones">( o toca altres mòbils)</string>
+  <string name="smp">Protocol de socialistes millionaris</string>
+  <string name="shared_secret_hint">Pista o pregunta</string>
+  <string name="shared_secret_secret">Secret compartit</string>
+  <string name="confirm">Confirmar</string>
+  <string name="in_progress">En progrés</string>
+  <string name="respond">Respondre</string>
+  <string name="failed">Fallat</string>
+  <string name="secrets_do_not_match">Els secrets no coincideixen</string>
+  <string name="try_again">Intenta una altra vegada</string>
+  <string name="finish">Acabat</string>
+  <string name="verified">Verificat</string>
+  <string name="smp_requested">Sol.licitar una verificació per SMP del contacte</string>
+  <string name="no_otr_session_found">Cap sessió OTR ha estat trobada!</string>
+  <string name="conversations_foreground_service">Converses</string>
+  <string name="pref_keep_foreground_service">Mantenir el servei en primer pla</string>
+  <string name="pref_keep_foreground_service_summary">Evitar que el sistema operatiu desconnecti la connexió</string>
+  <string name="choose_file">Escolliu un arxiu</string>
+  <string name="receiving_x_file">Rebent %1$s (%2$d%% completat)</string>
+  <string name="download_x_file">Descargat %s</string>
+  <string name="file">Arxiu</string>
+  <string name="open_x_file">Obert %s</string>
+  <string name="sending_file">Enviant (%1$d%% completat)</string>
+  <string name="preparing_file">Preparant arxiu per la transmissió</string>
+  <string name="x_file_offered_for_download">%s ofert per descarregar</string>
+  <string name="cancel_transmission">Transmissió cancelada</string>
+  <string name="file_transmission_failed">Arxiu de la transmissió caiguda</string>
+  <string name="file_deleted">L\'arxiu ha sigut eliminat</string>
+  <string name="no_application_found_to_open_file">Cap aplicació trobada a l\'obrir l\'arxiu</string>
+  <string name="could_not_verify_fingerprint">No s\'ha pogut verificar l\'empremta dactilar</string>
+  <string name="manually_verify">Verificat manualment</string>
+  <string name="are_you_sure_verify_fingerprint">Estàs segur que vols verificar l\'empremta dactilar OTR dels teus contactes?</string>
+  <string name="pref_show_dynamic_tags">Mostrar etiquetes dinàmiques</string>
+  <string name="pref_show_dynamic_tags_summary">Mostra etiquetes de nomès lectura per sota dels noms dels contactes</string>
+  <string name="enable_notifications">Habilitar notificació</string>
+  <string name="conference_with">Crear una sala amb ...</string>
+  <string name="no_conference_server_found">Servidor de la sala no trobat</string>
+  <string name="conference_creation_failed">Creació de la sala fallat</string>
+  <string name="conference_created">Sala creada</string>
+  <string name="secret_accepted">Aceptació del secret</string>
+  <string name="reset">Reset</string>
+  <string name="account_image_description">Avatar del compte</string>
+  <string name="copy_otr_clipboard_description">Copiar l\'empremta dactilar OTR al portapapers</string>
+  <string name="fetching_history_from_server">Anar a cercar la història als servidors</string>
+  <string name="no_more_history_on_server">No hi ha més histories al servidor</string>
+  <string name="updating">Actualitzant</string>
+  <string name="password_changed">Contrasenya canviada</string>
+  <string name="could_not_change_password">No s\'ha pogut canviar la contrasenya</string>
+  <string name="otr_session_not_started">Començar a enviar un missatge de conversació xifrat</string>
+  <string name="ask_question">Fer una pregunta</string>
+  <string name="smp_explain_question">Si vosté i el seu contacte tenen un secret en comú que ningú més sap (com una broma o simplement el que tenia per dinar l\'última vegada que es va trobar) pot utilitzar aquest secret per comprovar les empremtes dactilars de cadascú. \ n\ n  Proporcionarás una pista o una pregunta per a la seu contacte que respondrà amb una resposta entre majúscules i minúscules.</string>
+  <string name="smp_explain_answer">El seu contacte l\'hi agradaria verificar la seva empremta digital per un repte amb un secret compartit.El seu contacte proporciona el següent suggeriment o pregunta per aquest secret.</string>
+  <string name="shared_secret_hint_should_not_be_empty">El seu suggeriment no pot estar buit</string>
+  <string name="shared_secret_can_not_be_empty">El teu secret compartit no pot estar buit</string>
+  <string name="manual_verification_explanation">Compari acuradament l\'empremta digital que és mostra a continuació amb la empremta digital del seu contacte.\n\ També pots utilitzar alguna forma de confiança d la comunicació com a correu electrònic xifrat o alguna trucada telefònica per intercanviar-lo</string>
+  <string name="change_password">Cambiar contrasenya</string>
+  <string name="current_password">Contrasenya actual</string>
+  <string name="new_password">Nova contrasenya</string>
+  <string name="password_should_not_be_empty">Les contrasenyes no poden estar buides</string>
+  <string name="enable_all_accounts">Habilitar tots els comptes</string>
+  <string name="disable_all_accounts">Deshabilitar tots els comptes</string>
+  <string name="perform_action_with">Realitzar l\'acció amb ...</string>
+  <string name="no_affiliation">Cap afiliació</string>
+  <string name="no_role">Sense regles</string>
+  <string name="outcast">Outcast</string>
+  <string name="member">Membre</string>
+  <string name="advanced_mode">Mode avançat</string>
+  <string name="grant_membership">Admetre l\'afiliació</string>
+  <string name="remove_membership">Rebocar l\'afiliació</string>
+  <string name="grant_admin_privileges">Admetre privilegis d\'administrador</string>
+  <string name="remove_admin_privileges">Rebocar privilegis d\'administrador</string>
+  <string name="remove_from_room">Eliminar des de la sala</string>
+  <string name="could_not_change_affiliation">No s\'ha pogut canviar l\'afiliació del %s</string>
+  <string name="ban_from_conference">Banejat des de la sala</string>
+  <string name="removing_from_public_conference">Estàs intentant eliminar %s des d\'una sala pùblica. L\'unica manera per fer-ho és eliminar a l\'usuari per sempre</string>
+  <string name="ban_now">Banejat ara</string>
+  <string name="could_not_change_role">No s\'ha pogut canviar les regles de %s</string>
+  <string name="public_conference">Sala d\'accés pùblica</string>
+  <string name="private_conference">Privada, únicament membres de la sala</string>
+  <string name="conference_options">Opcions de la sala</string>
+  <string name="members_only">Privat( Nomès membres)</string>
+  <string name="non_anonymous">Sense anonimat</string>
+  <string name="modified_conference_options">Modificat opcions de la sala!</string>
+  <string name="could_not_modify_conference_options">No s\'ha pogut modificar les opcions de la sala</string>
+  <string name="never">Mai</string>
+  <string name="thirty_minutes">30 minuts</string>
+  <string name="one_hour">1 hora</string>
+  <string name="two_hours">2 Hores</string>
+  <string name="eight_hours">8 Hores</string>
+  <string name="until_further_notice">Fins nou avís</string>
+  <string name="pref_input_options">Opcions d\'entrada</string>
+  <string name="pref_enter_is_send">Entra per enviar</string>
+  <string name="pref_enter_is_send_summary">Utilitza el botó enter per enviar el missatge</string>
+  <string name="pref_display_enter_key">Mostra el botó enter</string>
+  <string name="pref_display_enter_key_summary">Canviar la clau dels emoticones per un botó d\'entrada </string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">imatge</string>
+  <string name="pdf_document">Document PDF</string>
+  <string name="apk">Aplicació d\'Android</string>
+  <string name="vcard">Contacte</string>
+  <string name="received_x_file">Rebut %s</string>
+  <string name="disable_foreground_service">Deshabilitat el servei de primer pla</string>
+  <string name="touch_to_open_conversations">Tocar per obrir les conversacions</string>
+  <string name="avatar_has_been_published">L\'avatar ha sigut publicat!</string>
+  <string name="sending_x_file">Enviant %s</string>
+  <string name="offering_x_file">Oferint %s</string>
 </resources>
diff --git a/src/main/res/values-ca@valencia/strings.xml b/src/main/res/values-ca@valencia/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/src/main/res/values-ca@valencia/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-cs/arrays.xml b/src/main/res/values-cs/arrays.xml
deleted file mode 100644
index 4510cf84..00000000
--- a/src/main/res/values-cs/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mobil</item>
-        <item>Telefon</item>
-        <item>Tablet</item>
-        <item>Konverzace</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>nikdy</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minut</item>
-        <item>jedna hodina</item>
-        <item>2 hodiny</item>
-        <item>8 hodin</item>
-        <item>než opět změním</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 33c7310b..a98b00f2 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -1,346 +1,419 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Nastavení</string>
-    <string name="action_add">Nová konverzace</string>
-    <string name="action_accounts">Nastavení účtů</string>
-    <string name="action_end_conversation">Ukončit tuto konverzaci</string>
-    <string name="action_contact_details">Detaily kontaktu</string>
-    <string name="action_muc_details">Detaily konference</string>
-    <string name="action_secure">Zabezpečená konverzace</string>
-    <string name="action_add_account">Přidat účet</string>
-    <string name="action_edit_contact">Upravit jméno</string>
-    <string name="action_add_phone_book">Přidat do telefonního seznamu</string>
-    <string name="action_delete_contact">Smazat ze seznamu</string>
-    <string name="title_activity_manage_accounts">Nastavení účtů</string>
-    <string name="title_activity_settings">Nastavení</string>
-    <string name="title_activity_conference_details">Detaily konference</string>
-    <string name="title_activity_contact_details">Detaily kontaktu</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Sdílet s konverzací</string>
-    <string name="title_activity_start_conversation">Začít konverzaci</string>
-    <string name="title_activity_choose_contact">Vybrat kontakt</string>
-    <string name="just_now">právě teď</string>
-    <string name="minute_ago">před minutou</string>
-    <string name="minutes_ago">před %d minutami</string>
-    <string name="unread_conversations">nepřečtené konverzace</string>
-    <string name="sending">odesílám…</string>
-    <string name="encrypted_message">Dešifruji zprávu. Chvíli strpení…</string>
-    <string name="nick_in_use">Přezdívka se již používá</string>
-    <string name="admin">Administrátor</string>
-    <string name="owner">Vlastník</string>
-    <string name="moderator">Moderátor</string>
-    <string name="participant">Účastník</string>
-    <string name="visitor">Návštěvník</string>
-    <string name="remove_contact_text">Chcete odstranit %s ze svého seznamu? Konverzace spojené s tímto kontaktem nebudou odstraněny.</string>
-    <string name="remove_bookmark_text">Chcete odstranit %s ze záložek? Konverzace spojené s touto záložkou nebudou odstraněny.</string>
-    <string name="register_account">Registrovat nový účet na serveru</string>
-    <string name="share_with">Sdílet s</string>
-    <string name="start_conversation">Začít konverzaci</string>
-    <string name="invite_contact">Pozvat kontakt</string>
-    <string name="contacts">Kontakty</string>
-    <string name="cancel">Zrušit</string>
-    <string name="set">Nastavit</string>
-    <string name="add">Přidat</string>
-    <string name="edit">Upravit</string>
-    <string name="delete">Smazat</string>
-    <string name="save">Uložit</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Aplikace Konverzace přestala reagovat</string>
-    <string name="crash_report_message">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace\n<b>Varování:</b> Toto použije nastavený XMPP účet pro zaslání detailů vývojářům.</string>
-    <string name="send_now">Odeslat teď</string>
-    <string name="send_never">Již se neptat</string>
-    <string name="problem_connecting_to_account">Připojení k účtu se nezdařilo</string>
-    <string name="problem_connecting_to_accounts">Připojení k několika účtům se nezdařilo</string>
-    <string name="touch_to_fix">Pro nastavení účtů ťukni sem</string>
-    <string name="attach_file">Přiložit soubor</string>
-    <string name="not_in_roster">Kontakt není v seznamu. Chcete ho přidat?</string>
-    <string name="add_contact">Přidat kontakt</string>
-    <string name="send_failed">doručení selhalo</string>
-    <string name="send_rejected">zamítnuto</string>
-    <string name="receiving_image">Přijímám obrázek (%1$d%%)</string>
-    <string name="preparing_image">Připravuji obrázek na přenos</string>
-    <string name="action_clear_history">Smazat historii</string>
-    <string name="clear_conversation_history">Smaže historii konverzací</string>
-    <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
-    <string name="delete_messages">Smazat zprávy</string>
-    <string name="also_end_conversation">Poté ukončit i tuto konverzaci</string>
-    <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
-    <string name="send_plain_text_message">Poslat textovou zprávu</string>
-    <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
-    <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
-    <string name="your_nick_has_been_changed">Přezdívka byla změněna</string>
-    <string name="download_image">Stáhnout obrázek</string>
-    <string name="image_offered_for_download"><i>Byl nabídnut obrázek ke stažení</i></string>
-    <string name="send_unencrypted">Poslat nešifrované</string>
-    <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Konverzace využívá aplikaci třetí strany, <b>OpenKeychain</b>, k šifrování a dešifrování zpráv a ke správě veřejných klíčů.\n\nOpenKeychain je licencován pod GPLv3 a dostupný na F-Droid a Google Play.\n\n<small>(Po instalaci prosím restartujte aplikaci Konverzace.)</small></string>
-    <string name="restart">Restartovat</string>
-    <string name="install">Instalovat</string>
-    <string name="offering">nabízí…</string>
-    <string name="waiting">čekám…</string>
-    <string name="no_pgp_key">Nebyl nalezen žádný OpenPGP klíč</string>
-    <string name="contact_has_no_pgp_key">Není možné zašifrovat zprávu v aplikaci Konverzace, protože druhá strana neoznamuje svůj veřejný klíč.\n\n<small>Požádejte svůj kontakt ať si nastaví OpenPGP.</small></string>
-    <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
-    <string name="contacts_have_no_pgp_keys">Není možné zašifrovat zprávy v aplikaci Konverzace, protože kontakty neoznamují svůj veřejný klíč.\n\n<small>Požádejte své kontakty ať si nastaví OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Byla přijata šifrovaná zpráva. Ťukni pro dešifrování a přečtení.</i></string>
-    <string name="encrypted_image_received"><i>Byl přijat šifrovaný obrázek. Ťukni pro dešifrování a prohlédnutí.</i></string>
-    <string name="image_file"><i>Byl přijat obrázek. Ťukni pro prohlédnutí</i></string>
-    <string name="pref_general">Obecné</string>
-    <string name="pref_xmpp_resource">XMPP zdroj</string>
-    <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
-    <string name="pref_accept_files">Přijímat soubory</string>
-    <string name="pref_accept_files_summary">Automaticky přijímat soubory menší než…</string>
-    <string name="pref_notification_settings">Nastavení upozornění</string>
-    <string name="pref_notifications">Upozornění</string>
-    <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
-    <string name="pref_vibrate">Vibrovat</string>
-    <string name="pref_vibrate_summary">Vibrovat při přijetí nové zprávy</string>
-    <string name="pref_sound">Zvuk</string>
-    <string name="pref_sound_summary">Přehrát zvuk společně s upozorněním</string>
-    <string name="pref_conference_notifications">Upozornění při konferencích</string>
-    <string name="pref_conference_notifications_summary">Vždy upozorňovat při nové konferenční zprávě, nejen pokud je vybrána</string>
-    <string name="pref_notification_grace_period">Četnost upozornění</string>
-    <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
-    <string name="pref_advanced_options">Pokročilé nastavení</string>
-    <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
-    <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
-    <string name="pref_confirm_messages">Potvrzovat zprávy</string>
-    <string name="pref_confirm_messages_summary">Dá vědět kontaktům, že zpráva byla přijata a přečtena</string>
-    <string name="pref_ui_options">Nastavení UI</string>
-    <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
-    <string name="error_decrypting_file">I/O chyba dešifrování souboru</string>
-    <string name="accept">Přijmout</string>
-    <string name="error">Došlo k chybě</string>
-    <string name="pref_grant_presence_updates">Povolit aktualizace stavu</string>
-    <string name="pref_grant_presence_updates_summary">Aktivně povolovat a žádat o zasílání změn stavu pro vytvářené kontakty</string>
-    <string name="subscriptions">Odběry</string>
-    <string name="your_account">Váš účet</string>
-    <string name="keys">Klíče</string>
-    <string name="send_presence_updates">Zasílat změny stavu</string>
-    <string name="receive_presence_updates">Přijímat změny stavu</string>
-    <string name="ask_for_presence_updates">Zažádat o změny stavu</string>
-    <string name="attach_choose_picture">Vybrat obrázek</string>
-    <string name="attach_take_picture">Vyfotit obrázek</string>
-    <string name="preemptively_grant">Aktivně povolovat vyžádání změn stavu</string>
-    <string name="error_not_an_image_file">Vybraný soubor není obrázek</string>
-    <string name="error_compressing_image">Chyba při konverzi obrázkového souboru</string>
-    <string name="error_file_not_found">Soubor nenalezen</string>
-    <string name="error_io_exception">Obecná I/O chyba. Že by již nebylo volné místo?</string>
-    <string name="error_security_exception_during_image_copy">Aplikace, která byla vybrána pro výběr obrázku, nepovolila přečtení souboru.\n\n<small>Zkuste použít jiného správce souborů pro výběr obrázku</small></string>
-    <string name="account_status_unknown">Neznámý</string>
-    <string name="account_status_disabled">Dočasně vypnuto</string>
-    <string name="account_status_online">Online</string>
-    <string name="account_status_connecting">Připojuji\u2026</string>
-    <string name="account_status_offline">Offline</string>
-    <string name="account_status_unauthorized">Nepřihlášen</string>
-    <string name="account_status_not_found">Server nenalezen</string>
-    <string name="account_status_no_internet">Žádné připojení</string>
-    <string name="account_status_regis_fail">Registrace selhala</string>
-    <string name="account_status_regis_conflict">Uživatelské jméno se již používá</string>
-    <string name="account_status_regis_success">Registrace dokončena</string>
-    <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
-    <string name="account_status_security_error">Bezpečnostní chyba</string>
-    <string name="account_status_incompatible_server">Nekompatibilní server</string>
-    <string name="encryption_choice_none">Čistý text</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Upravit účet</string>
-    <string name="mgmt_account_delete">Smazat účet</string>
-    <string name="mgmt_account_disable">Dočasně vypnout</string>
-    <string name="mgmt_account_publish_avatar">Zveřejnit avatar</string>
-    <string name="mgmt_account_publish_pgp">Zveřejnit OpenPGP klíč</string>
-    <string name="mgmt_account_enable">Povolit účet</string>
-    <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
-    <string name="mgmt_account_delete_confirm_text">Pokud smažete svůj účet celá historie konverzací bude ztracena</string>
-    <string name="attach_record_voice">Nahrát hlas</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="account_settings_password">Heslo</string>
-    <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
-    <string name="account_settings_confirm_password">Potvrdit heslo</string>
-    <string name="password">Heslo</string>
-    <string name="confirm_password">Potvrdit heslo</string>
-    <string name="passwords_do_not_match">Hesla nesouhlasí</string>
-    <string name="invalid_jid">Toto není platné Jabber ID</string>
-    <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
-    <string name="add_phone_book_text">Chcete přidat %s do svého telefonního seznamu?</string>
-    <string name="contact_status_online">online</string>
-    <string name="contact_status_free_to_chat">volný pro chat</string>
-    <string name="contact_status_away">pryč</string>
-    <string name="contact_status_extended_away">rozšířené pryč</string>
-    <string name="contact_status_do_not_disturb">nerušit</string>
-    <string name="contact_status_offline">offline</string>
-    <string name="muc_details_conference">Konference</string>
-    <string name="muc_details_other_members">Ostatní členové</string>
-    <string name="server_info_carbon_messages">XEP-0280: Kopie zpráv</string>
-    <string name="server_info_stream_management">XEP-0198: Nastavení proudu</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">dostupný</string>
-    <string name="server_info_unavailable">nedostupný</string>
-    <string name="missing_public_keys">Chybí oznámení o veřejném klíči</string>
-    <string name="last_seen_now">právě spatřen</string>
-    <string name="last_seen_min">naposledy spatřen před 1 minutou</string>
-    <string name="last_seen_mins">naposledy spatřen před %d minutami</string>
-    <string name="last_seen_hour">naposledy spatřen před 1 hodinou</string>
-    <string name="last_seen_hours">naposledy spatřen před %d hodinami</string>
-    <string name="last_seen_day">naposledy spatřen před 1 dnem</string>
-    <string name="last_seen_days">naposledy spatřen před %d dny</string>
-    <string name="never_seen">nebyl nikdy spatřen</string>
-    <string name="install_openkeychain">Šifrovaná zpráva. Nainstaluje prosím OpenKeychain pro dešifrování.</string>
-    <string name="unknown_otr_fingerprint">Neznámý OTR identifikátor</string>
-    <string name="openpgp_messages_found">Nalezena OpenPGP šifrovaná zpráva</string>
-    <string name="reception_failed">Příjem selhal</string>
-    <string name="your_fingerprint">Váš identifikátor</string>
-    <string name="otr_fingerprint">OTR identifikátor</string>
-    <string name="verify">Ověřit</string>
-    <string name="decrypt">Dešifrovat</string>
-    <string name="conferences">Konference</string>
-    <string name="search">Hledat</string>
-    <string name="create_contact">Vytvořit kontakt</string>
-    <string name="join_conference">Připojit ke konferenci</string>
-    <string name="delete_contact">Smazat kontakt</string>
-    <string name="view_contact_details">Zobrazit detaily kontaktu</string>
-    <string name="create">Vytvořit</string>
-    <string name="contact_already_exists">Kontakt již existuje</string>
-    <string name="join">Vstoupit</string>
-    <string name="conference_address">Adresa konference</string>
-    <string name="conference_address_example">mistnost@konference.server.cz</string>
-    <string name="save_as_bookmark">Uložit jako záložku</string>
-    <string name="delete_bookmark">Smazat záložku</string>
-    <string name="bookmark_already_exists">Tato záložka již existuje</string>
-    <string name="you">Já</string>
-    <string name="action_edit_subject">Upravit jméno konference</string>
-    <string name="conference_not_found">Konference nenalezena</string>
-    <string name="leave">Odejít</string>
-    <string name="contact_added_you">Kontakt přidán do seznamu</string>
-    <string name="add_back">Opět přidat</string>
-    <string name="contact_has_read_up_to_this_point">%s dočetl(a) až sem</string>
-    <string name="publish">Zveřejnit</string>
-    <string name="touch_to_choose_picture">Ťuknout na avatar a vybrat obrázek z galerie</string>
-    <string name="publish_avatar_explanation">Pozor: Každý s povolením vidět změny stavu uvidí tento obrázek.</string>
-    <string name="publishing">Zveřejňuji…</string>
-    <string name="error_publish_avatar_server_reject">Server odmítl toto zveřejnění</string>
-    <string name="error_publish_avatar_converting">Při konverzi obrázku se něco nezdařilo</string>
-    <string name="error_saving_avatar">Nepodařilo se uložit avatar na disk</string>
-    <string name="or_long_press_for_default">(Stisknout dlouze pro obnovení výchozího stavu)</string>
-    <string name="error_publish_avatar_no_server_support">Váš server nepodporuje zveřejňování avataru</string>
-    <string name="private_message">šeptem</string>
-    <string name="private_message_to">pro %s</string>
-    <string name="send_private_message_to">Zaslat soukromou zprávu pro %s</string>
-    <string name="connect">Připojit</string>
-    <string name="account_already_exists">Tento účet již existuje</string>
-    <string name="next">Další</string>
-    <string name="server_info_session_established">Současné sezení vytvořeno</string>
-    <string name="additional_information">Dodatečné informace</string>
-    <string name="skip">Přeskočit</string>
-    <string name="disable_notifications">Vypnout upozornění</string>
-    <string name="disable_notifications_for_this_conversation">Vypnout upozornění pro tuto konverzaci</string>
-    <string name="notifications_disabled">Upozornění jsou vypnuta</string>
-    <string name="enable">Povolit</string>
-    <string name="conference_requires_password">Konference vyžaduje heslo</string>
-    <string name="enter_password">Vložit heslo</string>
-    <string name="missing_presence_updates">Chybí informace o změnách stavu kontaktu</string>
-    <string name="request_presence_updates">Nejdříve si prosím vyžádejte povolení o zasílání změn stavu kontaktu.\n\n<small>To bude poté použito pro zjištění jakou aplikaci tento kontakt používá.</small></string>
-    <string name="request_now">Ihned vyžádat</string>
-    <string name="delete_fingerprint">Smazat identifikátor</string>
-    <string name="sure_delete_fingerprint">Chcete opravdu smazat tento identifikátor?</string>
-    <string name="ignore">Ignorovat</string>
-    <string name="without_mutual_presence_updates"><b>Varování:</b> Odeslání bez povolení změn stavu může způsobit nečekané problémy na obou stranách.\n\n<small>Přejdi na detaily kontaktu pro ověření povolení o změnách stavu.</small></string>
-    <string name="pref_encryption_settings">Nastavení šifrování</string>
-    <string name="pref_force_encryption">Vynutit šifrování</string>
-    <string name="pref_force_encryption_summary">Vždy zasílat šifrované zprávy (mimo konference)</string>
-    <string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
-    <string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
-    <string name="pref_enable_legacy_ssl">Povolit zastaralé SSL</string>
-    <string name="pref_enable_legacy_ssl_summary">Povolí SSLv3 podporu pro zastaralé servery. Varování: SSLv3 není již považováno za bezpečné.</string>
-    <string name="pref_expert_options">Expertní nastavení</string>
-    <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
-    <string name="title_activity_about">O aplikaci Conversations</string>
-    <string name="pref_about_conversations_summary">Informace o sestavení a licenci</string>
-    <string name="title_pref_quiet_hours">Tichý režim</string>
-    <string name="title_pref_quiet_hours_start_time">Odkdy</string>
-    <string name="title_pref_quiet_hours_end_time">Dokdy</string>
-    <string name="title_pref_enable_quiet_hours">Povolit tichý režim</string>
-    <string name="pref_quiet_hours_summary">Upozornění budou během tichého režimu ztlumena</string>
-    <string name="pref_use_larger_font">Zvětšit písmo</string>
-    <string name="pref_use_larger_font_summary">Používat v celé aplikaci větší velikost písma</string>
-    <string name="pref_use_send_button_to_indicate_status">Tlačítko pro odeslání zobrazuje stav</string>
-    <string name="pref_use_indicate_received">Požadovat oznámení o přijetí</string>
-    <string name="pref_use_indicate_received_summary">Přijaté zprávy budou označeny zeleně, pokud je funkce podporována</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Obarvit tlačítko odesílání barvou indikující stavu kontaktu</string>
-    <string name="pref_expert_options_other">Další</string>
-    <string name="pref_conference_name">Jméno konference</string>
-    <string name="pref_conference_name_summary">Pro identifikaci konferencí použít téma místnosti místo jejího JID</string>
-    <string name="toast_message_otr_fingerprint">OTR otisk zkopírován do schránky!</string>
-    <string name="conference_banned">Vstup do konference byl zakázán</string>
-    <string name="conference_members_only">Tato konference je pouze pro členy</string>
-    <string name="conference_kicked">Vykopli tě z této konference</string>
-    <string name="using_account">za použití účtu %s</string>
-    <string name="checking_image">Ověřuji obrázek na HTTP hostiteli</string>
-    <string name="image_file_deleted">Obrázek byl smazán</string>
-    <string name="not_connected_try_again">Bez připojení. Zkus znovu později</string>
-    <string name="check_image_filesize">Ověřit velikost obrázku</string>
-    <string name="message_options">Možnosti zpráv</string>
-    <string name="copy_text">Zkopírovat text</string>
-    <string name="share_image">Sdílet obrázek</string>
-    <string name="copy_original_url">Kopírovat originální URL</string>
-    <string name="send_again">Poslat znovu</string>
-    <string name="image_url">URL obrázku</string>
-    <string name="message_text">Text zprávy</string>
-    <string name="url_copied_to_clipboard">URL zkopírováno do schránky</string>
-    <string name="message_copied_to_clipboard">Zpráva zkopírována do schránky</string>
-    <string name="image_transmission_failed">Přenos obrázku selhal</string>
-    <string name="scan_qr_code">Skenovat QR kód</string>
-    <string name="show_qr_code">Zobrazit QR kód</string>
-    <string name="account_details">Detaily účtu</string>
-    <string name="verify_otr">Ověřit OTR</string>
-    <string name="remote_fingerprint">Vzdálený otisk</string>
-    <string name="scan">skenovat</string>
-    <string name="or_touch_phones">(nebo dotykové telefony)</string>
-    <string name="smp">Socialist Millionaire Protocol</string>
-    <string name="shared_secret_hint">Nápověda nebo Otázka</string>
-    <string name="shared_secret_secret">Sdílené tajemství</string>
-    <string name="confirm">Potvrdit</string>
-    <string name="in_progress">Probíhá</string>
-    <string name="respond">Odpovědět</string>
-    <string name="failed">Selhalo</string>
-    <string name="secrets_do_not_match">Tajemství se neshodují</string>
-    <string name="try_again">Zkusit znovu</string>
-    <string name="finish">Dokončit</string>
-    <string name="verified">Ověřeno!</string>
-    <string name="smp_requested">Kontakt zažádal o ověření SMP</string>
-    <string name="no_otr_session_found">Nebylo nalezeno platné OTR sezení!</string>
-    <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Ťukni pro vypnutí služby v popředí</string>
-    <string name="pref_keep_foreground_service">Ponechat službu v popředí</string>
-    <string name="pref_keep_foreground_service_summary">Zamezit operačnímu systému v ukončení připojení</string>
-    <string name="choose_file">Vybrat soubor</string>
-    <string name="receiving_file">Přijímám %1$s soubor (%2$d%% přeneseno)</string>
-    <string name="download_file">Stáhnout %s soubor</string>
-    <string name="open_file">Otevřít %s soubor</string>
-    <string name="sending_file">odesílám (%1$d%% přeneseno)</string>
-    <string name="preparing_file">Příprava souboru na přenos</string>
-    <string name="file_offered_for_download">Soubor nabídnut ke stažení</string>
-    <string name="file">%s soubor</string>
-    <string name="cancel_transmission">Zrušit přenos</string>
-    <string name="file_transmission_failed">přenos souboru selhal</string>
-    <string name="file_deleted">Soubor byl smazán</string>
-    <string name="no_application_found_to_open_file">Nebyla nalezena aplikace umožňující otevření souboru</string>
-    <string name="could_not_verify_fingerprint">Ověření otisku se nezdařilo</string>
-    <string name="manually_verify">Ruční ověření</string>
-    <string name="are_you_sure_verify_fingerprint">Opravdu si přejete ověřit OTR otisk kontaktu?</string>
-    <string name="pref_show_dynamic_tags">Zobrazit dynamické tagy</string>
-    <string name="pref_show_dynamic_tags_summary">Zobrazit tagy pro čtení pod kontakty</string>
-    <string name="enable_notifications">Povolit upozornění</string>
-    <string name="conference_with">Vytvořit konferenci s…</string>
-    <string name="no_conference_server_found">Nebyl nalezen konferenční server</string>
-    <string name="conference_creation_failed">Vytvoření konference selhalo!</string>
-    <string name="conference_created">Konference vytvořena!</string>
-    <string name="secret_accepted">Tajemství souhlasí!</string>
-    <string name="reset">Reset</string>
-    <string name="account_image_description">Avatar účtu</string>
-    <string name="copy_otr_clipboard_description">Zkopírovat otisk OTR do schránky</string>
-    <string name="fetching_history_from_server">Načíst historii ze serveru</string>
-    <string name="no_more_history_on_server">Na serveru není žádná další historie</string>
+  <string name="action_settings">Nastavení</string>
+  <string name="action_add">Nová konverzace</string>
+  <string name="action_accounts">Nastavení účtů</string>
+  <string name="action_end_conversation">Ukončit tuto konverzaci</string>
+  <string name="action_contact_details">Detaily kontaktu</string>
+  <string name="action_muc_details">Detaily konference</string>
+  <string name="action_secure">Zabezpečená konverzace</string>
+  <string name="action_add_account">Přidat účet</string>
+  <string name="action_edit_contact">Upravit jméno</string>
+  <string name="action_add_phone_book">Přidat do telefonního seznamu</string>
+  <string name="action_delete_contact">Smazat ze seznamu</string>
+  <string name="action_block_contact">Zablokovat kontakt</string>
+  <string name="action_unblock_contact">Odblokovat kontakt</string>
+  <string name="action_block_domain">Zablokovat doménu</string>
+  <string name="action_unblock_domain">Odblokovat doménu</string>
+  <string name="title_activity_manage_accounts">Nastavení účtů</string>
+  <string name="title_activity_settings">Nastavení</string>
+  <string name="title_activity_conference_details">Detaily konference</string>
+  <string name="title_activity_contact_details">Detaily kontaktu</string>
+  <string name="title_activity_sharewith">Sdílet s konverzací</string>
+  <string name="title_activity_start_conversation">Začít konverzaci</string>
+  <string name="title_activity_choose_contact">Vybrat kontakt</string>
+  <string name="title_activity_block_list">Seznam blokovaných</string>
+  <string name="just_now">právě teď</string>
+  <string name="minute_ago">před minutou</string>
+  <string name="minutes_ago">před %d minutami</string>
+  <string name="unread_conversations">nepřečtené konverzace</string>
+  <string name="sending">odesílám…</string>
+  <string name="encrypted_message">Dešifruji zprávu. Chvíli strpení…</string>
+  <string name="nick_in_use">Přezdívka se již používá</string>
+  <string name="admin">Administrátor</string>
+  <string name="owner">Vlastník</string>
+  <string name="moderator">Moderátor</string>
+  <string name="participant">Účastník</string>
+  <string name="visitor">Návštěvník</string>
+  <string name="remove_contact_text">Chcete odstranit %s ze svého seznamu? Konverzace spojené s tímto kontaktem nebudou odstraněny.</string>
+  <string name="block_contact_text">Chcete zablokovat příjem zpráv od %s?</string>
+  <string name="unblock_contact_text">Chcete odblokovat příjem zpráv od %s?</string>
+  <string name="block_domain_text">Zablokovat všechny kontakty z %s?</string>
+  <string name="unblock_domain_text">Odblokovat všechny kontakty z %s?</string>
+  <string name="contact_blocked">Kontakty zablokovány</string>
+  <string name="remove_bookmark_text">Chcete odstranit %s ze záložek? Konverzace spojené s touto záložkou nebudou odstraněny.</string>
+  <string name="register_account">Registrovat nový účet na serveru</string>
+  <string name="change_password_on_server">Změnit heslo na serveru</string>
+  <string name="share_with">Sdílet s...</string>
+  <string name="start_conversation">Začít konverzaci</string>
+  <string name="invite_contact">Pozvat kontakt</string>
+  <string name="contacts">Kontakty</string>
+  <string name="cancel">Zrušit</string>
+  <string name="set">Nastavit</string>
+  <string name="add">Přidat</string>
+  <string name="edit">Upravit</string>
+  <string name="delete">Smazat</string>
+  <string name="block">Zablokovat</string>
+  <string name="unblock">Odblokovat</string>
+  <string name="save">Uložit</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Aplikace Konverzace přestala reagovat</string>
+  <string name="crash_report_message">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace\n<b>Varování:</b> Toto použije nastavený XMPP účet pro zaslání detailů vývojářům.</string>
+  <string name="send_now">Odeslat teď</string>
+  <string name="send_never">Již se neptat</string>
+  <string name="problem_connecting_to_account">Připojení k účtu se nezdařilo</string>
+  <string name="problem_connecting_to_accounts">Připojení k několika účtům se nezdařilo</string>
+  <string name="touch_to_fix">Pro nastavení účtů ťukni sem</string>
+  <string name="attach_file">Přiložit soubor</string>
+  <string name="not_in_roster">Kontakt není v seznamu. Chcete ho přidat?</string>
+  <string name="add_contact">Přidat kontakt</string>
+  <string name="send_failed">doručení selhalo</string>
+  <string name="send_rejected">zamítnuto</string>
+  <string name="preparing_image">Připravuji obrázek na přenos</string>
+  <string name="action_clear_history">Smazat historii</string>
+  <string name="clear_conversation_history">Smaže historii konverzací</string>
+  <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
+  <string name="delete_messages">Smazat zprávy</string>
+  <string name="also_end_conversation">Poté ukončit i tuto konverzaci</string>
+  <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
+  <string name="send_plain_text_message">Poslat textovou zprávu</string>
+  <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
+  <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
+  <string name="your_nick_has_been_changed">Přezdívka byla změněna</string>
+  <string name="download_image">Stáhnout obrázek</string>
+  <string name="send_unencrypted">Poslat nešifrované</string>
+  <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Konverzace využívá aplikaci třetí strany, <b>OpenKeychain</b>, k šifrování a dešifrování zpráv a ke správě veřejných klíčů.\n\nOpenKeychain je licencován pod GPLv3 a dostupný na F-Droid a Google Play.\n\n<small>(Po instalaci prosím restartujte aplikaci Konverzace.)</small></string>
+  <string name="restart">Restartovat</string>
+  <string name="install">Instalovat</string>
+  <string name="offering">nabízí…</string>
+  <string name="waiting">čekám…</string>
+  <string name="no_pgp_key">Nebyl nalezen žádný OpenPGP klíč</string>
+  <string name="contact_has_no_pgp_key">Není možné zašifrovat zprávu v aplikaci Konverzace, protože druhá strana neoznamuje svůj veřejný klíč.\n\n<small>Požádejte svůj kontakt ať si nastaví OpenPGP.</small></string>
+  <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
+  <string name="contacts_have_no_pgp_keys">Není možné zašifrovat zprávy v aplikaci Konverzace, protože kontakty neoznamují svůj veřejný klíč.\n\n<small>Požádejte své kontakty ať si nastaví OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Byla přijata šifrovaná zpráva. Ťukni pro dešifrování a přečtení.</i></string>
+  <string name="pref_general">Obecné</string>
+  <string name="pref_xmpp_resource">XMPP zdroj</string>
+  <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
+  <string name="pref_accept_files">Přijímat soubory</string>
+  <string name="pref_accept_files_summary">Automaticky přijímat soubory menší než…</string>
+  <string name="pref_notification_settings">Nastavení upozornění</string>
+  <string name="pref_notifications">Upozornění</string>
+  <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
+  <string name="pref_vibrate">Vibrovat</string>
+  <string name="pref_vibrate_summary">Vibrovat při přijetí nové zprávy</string>
+  <string name="pref_sound">Zvuk</string>
+  <string name="pref_sound_summary">Přehrát zvuk společně s upozorněním</string>
+  <string name="pref_conference_notifications">Upozornění při konferencích</string>
+  <string name="pref_conference_notifications_summary">Vždy upozorňovat při nové konferenční zprávě, nejen pokud je vybrána</string>
+  <string name="pref_notification_grace_period">Četnost upozornění</string>
+  <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
+  <string name="pref_advanced_options">Pokročilé nastavení</string>
+  <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
+  <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
+  <string name="pref_confirm_messages">Potvrzovat zprávy</string>
+  <string name="pref_confirm_messages_summary">Dá vědět kontaktům, že zpráva byla přijata a přečtena</string>
+  <string name="pref_ui_options">Nastavení UI</string>
+  <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
+  <string name="error_decrypting_file">I/O chyba dešifrování souboru</string>
+  <string name="accept">Přijmout</string>
+  <string name="error">Došlo k chybě</string>
+  <string name="pref_grant_presence_updates">Povolit aktualizace stavu</string>
+  <string name="pref_grant_presence_updates_summary">Aktivně povolovat a žádat o zasílání změn stavu pro vytvářené kontakty</string>
+  <string name="subscriptions">Odběry</string>
+  <string name="your_account">Váš účet</string>
+  <string name="keys">Klíče</string>
+  <string name="send_presence_updates">Zasílat změny stavu</string>
+  <string name="receive_presence_updates">Přijímat změny stavu</string>
+  <string name="ask_for_presence_updates">Zažádat o změny stavu</string>
+  <string name="attach_choose_picture">Vybrat obrázek</string>
+  <string name="attach_take_picture">Vyfotit obrázek</string>
+  <string name="preemptively_grant">Aktivně povolovat vyžádání změn stavu</string>
+  <string name="error_not_an_image_file">Vybraný soubor není obrázek</string>
+  <string name="error_compressing_image">Chyba při konverzi obrázkového souboru</string>
+  <string name="error_file_not_found">Soubor nenalezen</string>
+  <string name="error_io_exception">Obecná I/O chyba. Že by již nebylo volné místo?</string>
+  <string name="error_security_exception_during_image_copy">Aplikace, která byla vybrána pro výběr obrázku, nepovolila přečtení souboru.\n\n<small>Zkuste použít jiného správce souborů pro výběr obrázku</small></string>
+  <string name="account_status_unknown">Neznámý</string>
+  <string name="account_status_disabled">Dočasně vypnuto</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_connecting">Připojuji\u2026</string>
+  <string name="account_status_offline">Offline</string>
+  <string name="account_status_unauthorized">Nepřihlášen</string>
+  <string name="account_status_not_found">Server nenalezen</string>
+  <string name="account_status_no_internet">Žádné připojení</string>
+  <string name="account_status_regis_fail">Registrace selhala</string>
+  <string name="account_status_regis_conflict">Uživatelské jméno se již používá</string>
+  <string name="account_status_regis_success">Registrace dokončena</string>
+  <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
+  <string name="account_status_security_error">Bezpečnostní chyba</string>
+  <string name="account_status_incompatible_server">Nekompatibilní server</string>
+  <string name="encryption_choice_none">Čistý text</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Upravit účet</string>
+  <string name="mgmt_account_delete">Smazat účet</string>
+  <string name="mgmt_account_disable">Dočasně vypnout</string>
+  <string name="mgmt_account_publish_avatar">Zveřejnit avatar</string>
+  <string name="mgmt_account_publish_pgp">Zveřejnit OpenPGP klíč</string>
+  <string name="mgmt_account_enable">Povolit účet</string>
+  <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
+  <string name="mgmt_account_delete_confirm_text">Pokud smažete svůj účet celá historie konverzací bude ztracena</string>
+  <string name="attach_record_voice">Nahrát hlas</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">Heslo</string>
+  <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
+  <string name="account_settings_confirm_password">Potvrdit heslo</string>
+  <string name="password">Heslo</string>
+  <string name="confirm_password">Potvrdit heslo</string>
+  <string name="passwords_do_not_match">Hesla nesouhlasí</string>
+  <string name="invalid_jid">Toto není platné Jabber ID</string>
+  <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
+  <string name="add_phone_book_text">Chcete přidat %s do svého telefonního seznamu?</string>
+  <string name="contact_status_online">online</string>
+  <string name="contact_status_free_to_chat">volný pro chat</string>
+  <string name="contact_status_away">pryč</string>
+  <string name="contact_status_extended_away">rozšířené pryč</string>
+  <string name="contact_status_do_not_disturb">nerušit</string>
+  <string name="contact_status_offline">offline</string>
+  <string name="muc_details_conference">Konference</string>
+  <string name="muc_details_other_members">Ostatní členové</string>
+  <string name="server_info_show_more">Údaje serveru</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Kopie zpráv</string>
+  <string name="server_info_csi">XEP-0352: Zobrazování stavu klienta</string>
+  <string name="server_info_blocking">XEP-0191: Příkaz blokování</string>
+  <string name="server_info_roster_version">XEP-0237: Verzování seznamu</string>
+  <string name="server_info_stream_management">XEP-0198: Nastavení proudu</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">dostupný</string>
+  <string name="server_info_unavailable">nedostupný</string>
+  <string name="missing_public_keys">Chybí oznámení o veřejném klíči</string>
+  <string name="last_seen_now">právě spatřen</string>
+  <string name="last_seen_min">naposledy spatřen před 1 minutou</string>
+  <string name="last_seen_mins">naposledy spatřen před %d minutami</string>
+  <string name="last_seen_hour">naposledy spatřen před 1 hodinou</string>
+  <string name="last_seen_hours">naposledy spatřen před %d hodinami</string>
+  <string name="last_seen_day">naposledy spatřen před 1 dnem</string>
+  <string name="last_seen_days">naposledy spatřen před %d dny</string>
+  <string name="never_seen">nebyl nikdy spatřen</string>
+  <string name="install_openkeychain">Šifrovaná zpráva. Nainstaluje prosím OpenKeychain pro dešifrování.</string>
+  <string name="unknown_otr_fingerprint">Neznámý OTR identifikátor</string>
+  <string name="openpgp_messages_found">Nalezena OpenPGP šifrovaná zpráva</string>
+  <string name="reception_failed">Příjem selhal</string>
+  <string name="your_fingerprint">Váš identifikátor</string>
+  <string name="otr_fingerprint">OTR identifikátor</string>
+  <string name="verify">Ověřit</string>
+  <string name="decrypt">Dešifrovat</string>
+  <string name="conferences">Konference</string>
+  <string name="search">Hledat</string>
+  <string name="create_contact">Vytvořit kontakt</string>
+  <string name="join_conference">Připojit ke konferenci</string>
+  <string name="delete_contact">Smazat kontakt</string>
+  <string name="view_contact_details">Zobrazit detaily kontaktu</string>
+  <string name="block_contact">Zablokovat kontakt</string>
+  <string name="unblock_contact">Odblokovat kontakt</string>
+  <string name="create">Vytvořit</string>
+  <string name="contact_already_exists">Kontakt již existuje</string>
+  <string name="join">Vstoupit</string>
+  <string name="conference_address">Adresa konference</string>
+  <string name="conference_address_example">mistnost@konference.server.cz</string>
+  <string name="save_as_bookmark">Uložit jako záložku</string>
+  <string name="delete_bookmark">Smazat záložku</string>
+  <string name="bookmark_already_exists">Tato záložka již existuje</string>
+  <string name="you">Já</string>
+  <string name="action_edit_subject">Upravit jméno konference</string>
+  <string name="conference_not_found">Konference nenalezena</string>
+  <string name="leave">Odejít</string>
+  <string name="contact_added_you">Kontakt přidán do seznamu</string>
+  <string name="add_back">Opět přidat</string>
+  <string name="contact_has_read_up_to_this_point">%s dočetl(a) až sem</string>
+  <string name="publish">Zveřejnit</string>
+  <string name="touch_to_choose_picture">Ťuknout na avatar a vybrat obrázek z galerie</string>
+  <string name="publish_avatar_explanation">Pozor: Každý s povolením vidět změny stavu uvidí tento obrázek.</string>
+  <string name="publishing">Zveřejňuji…</string>
+  <string name="error_publish_avatar_server_reject">Server odmítl toto zveřejnění</string>
+  <string name="error_publish_avatar_converting">Při konverzi obrázku se něco nezdařilo</string>
+  <string name="error_saving_avatar">Nepodařilo se uložit avatar na disk</string>
+  <string name="or_long_press_for_default">(Stisknout dlouze pro obnovení výchozího stavu)</string>
+  <string name="error_publish_avatar_no_server_support">Váš server nepodporuje zveřejňování avataru</string>
+  <string name="private_message">šeptem</string>
+  <string name="private_message_to">pro %s</string>
+  <string name="send_private_message_to">Zaslat soukromou zprávu pro %s</string>
+  <string name="connect">Připojit</string>
+  <string name="account_already_exists">Tento účet již existuje</string>
+  <string name="next">Další</string>
+  <string name="server_info_session_established">Současné sezení vytvořeno</string>
+  <string name="additional_information">Dodatečné informace</string>
+  <string name="skip">Přeskočit</string>
+  <string name="disable_notifications">Vypnout upozornění</string>
+  <string name="disable_notifications_for_this_conversation">Vypnout upozornění pro tuto konverzaci</string>
+  <string name="notifications_disabled">Upozornění jsou vypnuta</string>
+  <string name="enable">Povolit</string>
+  <string name="conference_requires_password">Konference vyžaduje heslo</string>
+  <string name="enter_password">Vložit heslo</string>
+  <string name="missing_presence_updates">Chybí informace o změnách stavu kontaktu</string>
+  <string name="request_presence_updates">Nejdříve si prosím vyžádejte povolení o zasílání změn stavu kontaktu.\n\n<small>To bude poté použito pro zjištění jakou aplikaci tento kontakt používá.</small></string>
+  <string name="request_now">Ihned vyžádat</string>
+  <string name="delete_fingerprint">Smazat identifikátor</string>
+  <string name="sure_delete_fingerprint">Chcete opravdu smazat tento identifikátor?</string>
+  <string name="ignore">Ignorovat</string>
+  <string name="without_mutual_presence_updates"><b>Varování:</b> Odeslání bez povolení změn stavu může způsobit nečekané problémy na obou stranách.\n\n<small>Přejdi na detaily kontaktu pro ověření povolení o změnách stavu.</small></string>
+  <string name="pref_encryption_settings">Nastavení šifrování</string>
+  <string name="pref_force_encryption">Vynutit šifrování</string>
+  <string name="pref_force_encryption_summary">Vždy zasílat šifrované zprávy (mimo konference)</string>
+  <string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
+  <string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
+  <string name="pref_expert_options">Expertní nastavení</string>
+  <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
+  <string name="title_activity_about">O aplikaci Conversations</string>
+  <string name="pref_about_conversations_summary">Informace o sestavení a licenci</string>
+  <string name="title_pref_quiet_hours">Tichý režim</string>
+  <string name="title_pref_quiet_hours_start_time">Odkdy</string>
+  <string name="title_pref_quiet_hours_end_time">Dokdy</string>
+  <string name="title_pref_enable_quiet_hours">Povolit tichý režim</string>
+  <string name="pref_quiet_hours_summary">Upozornění budou během tichého režimu ztlumena</string>
+  <string name="pref_use_larger_font">Zvětšit písmo</string>
+  <string name="pref_use_larger_font_summary">Používat v celé aplikaci větší velikost písma</string>
+  <string name="pref_use_send_button_to_indicate_status">Tlačítko pro odeslání zobrazuje stav</string>
+  <string name="pref_use_indicate_received">Požadovat oznámení o přijetí</string>
+  <string name="pref_use_indicate_received_summary">Přijaté zprávy budou označeny zeleně, pokud je funkce podporována</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Obarvit tlačítko odesílání barvou indikující stavu kontaktu</string>
+  <string name="pref_expert_options_other">Další</string>
+  <string name="pref_conference_name">Jméno konference</string>
+  <string name="pref_conference_name_summary">Pro identifikaci konferencí použít téma místnosti místo jejího JID</string>
+  <string name="toast_message_otr_fingerprint">OTR otisk zkopírován do schránky!</string>
+  <string name="conference_banned">Vstup do konference byl zakázán</string>
+  <string name="conference_members_only">Tato konference je pouze pro členy</string>
+  <string name="conference_kicked">Vykopli tě z této konference</string>
+  <string name="using_account">za použití účtu %s</string>
+  <string name="checking_image">Ověřuji obrázek na HTTP hostiteli</string>
+  <string name="image_file_deleted">Obrázek byl smazán</string>
+  <string name="not_connected_try_again">Bez připojení. Zkus znovu později</string>
+  <string name="check_image_filesize">Ověřit velikost obrázku</string>
+  <string name="message_options">Možnosti zpráv</string>
+  <string name="copy_text">Zkopírovat text</string>
+  <string name="copy_original_url">Kopírovat originální URL</string>
+  <string name="send_again">Poslat znovu</string>
+  <string name="image_url">URL obrázku</string>
+  <string name="message_text">Text zprávy</string>
+  <string name="url_copied_to_clipboard">URL zkopírováno do schránky</string>
+  <string name="message_copied_to_clipboard">Zpráva zkopírována do schránky</string>
+  <string name="image_transmission_failed">Přenos obrázku selhal</string>
+  <string name="scan_qr_code">Skenovat QR kód</string>
+  <string name="show_qr_code">Zobrazit QR kód</string>
+  <string name="show_block_list">Zobrazit seznam blokovaných</string>
+  <string name="account_details">Detaily účtu</string>
+  <string name="verify_otr">Ověřit OTR</string>
+  <string name="remote_fingerprint">Vzdálený otisk</string>
+  <string name="scan">skenovat</string>
+  <string name="or_touch_phones">(nebo dotykové telefony)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Nápověda nebo Otázka</string>
+  <string name="shared_secret_secret">Sdílené tajemství</string>
+  <string name="confirm">Potvrdit</string>
+  <string name="in_progress">Probíhá</string>
+  <string name="respond">Odpovědět</string>
+  <string name="failed">Selhalo</string>
+  <string name="secrets_do_not_match">Tajemství se neshodují</string>
+  <string name="try_again">Zkusit znovu</string>
+  <string name="finish">Dokončit</string>
+  <string name="verified">Ověřeno!</string>
+  <string name="smp_requested">Kontakt zažádal o ověření SMP</string>
+  <string name="no_otr_session_found">Nebylo nalezeno platné OTR sezení!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Ponechat službu v popředí</string>
+  <string name="pref_keep_foreground_service_summary">Zamezit operačnímu systému v ukončení připojení</string>
+  <string name="choose_file">Vybrat soubor</string>
+  <string name="receiving_x_file">Přijímám %1$s (%2$d%% dokončeno)</string>
+  <string name="download_x_file">Stáhnout %s</string>
+  <string name="file">soubor</string>
+  <string name="open_x_file">Otevřít %s</string>
+  <string name="sending_file">odesílám (%1$d%% přeneseno)</string>
+  <string name="preparing_file">Příprava souboru na přenos</string>
+  <string name="x_file_offered_for_download">%s nabídnuto ke stažení</string>
+  <string name="cancel_transmission">Zrušit přenos</string>
+  <string name="file_transmission_failed">přenos souboru selhal</string>
+  <string name="file_deleted">Soubor byl smazán</string>
+  <string name="no_application_found_to_open_file">Nebyla nalezena aplikace umožňující otevření souboru</string>
+  <string name="could_not_verify_fingerprint">Ověření otisku se nezdařilo</string>
+  <string name="manually_verify">Ruční ověření</string>
+  <string name="are_you_sure_verify_fingerprint">Opravdu si přejete ověřit OTR otisk kontaktu?</string>
+  <string name="pref_show_dynamic_tags">Zobrazit dynamické tagy</string>
+  <string name="pref_show_dynamic_tags_summary">Zobrazit tagy pro čtení pod kontakty</string>
+  <string name="enable_notifications">Povolit upozornění</string>
+  <string name="conference_with">Vytvořit konferenci s…</string>
+  <string name="no_conference_server_found">Nebyl nalezen konferenční server</string>
+  <string name="conference_creation_failed">Vytvoření konference selhalo!</string>
+  <string name="conference_created">Konference vytvořena!</string>
+  <string name="secret_accepted">Tajemství souhlasí!</string>
+  <string name="reset">Reset</string>
+  <string name="account_image_description">Avatar účtu</string>
+  <string name="copy_otr_clipboard_description">Zkopírovat otisk OTR do schránky</string>
+  <string name="fetching_history_from_server">Načíst historii ze serveru</string>
+  <string name="no_more_history_on_server">Na serveru není žádná další historie</string>
+  <string name="updating">Aktualizuji...</string>
+  <string name="password_changed">Heslo změněno!</string>
+  <string name="could_not_change_password">Nelze změnit heslo</string>
+  <string name="otr_session_not_started">Zaslat zprávu pro spuštění šifrovaného chatu</string>
+  <string name="ask_question">Položit otázku</string>
+  <string name="smp_explain_question">Pokud máte vy i váš kontakt společné tajemství které neví nikdo jiný (něco jako společný vtip nebo co jste spolu měli k obědu při svém posledním setkání), můžete toto tajemství použít pro ověření pravosti svých šifrovacích otisků.\n\nZadáte nápovědu nebo otázku a kontakt na ni správně odpoví.</string>
+  <string name="smp_explain_answer">Váš kontakt by rád ověřil pravost šifrovacího otisku dotazem na společné tajemství. Váš kontakt zadal následující nápovědu nebo otázku pro zodpovězení tajemství.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Nápověda by měla být vyplněna</string>
+  <string name="shared_secret_can_not_be_empty">Společně tajemství nemůže být nevyplněno</string>
+  <string name="manual_verification_explanation">Opatrně porovnejte otisk zobrazený níže s otiskem vašeho kontatku.\nMůžete využít jakoukoliv bezpečnou formu komunikace pro jejich výměnu, jako třeba šifrovaný email nebo telefonát.</string>
+  <string name="change_password">Změnit heslo</string>
+  <string name="current_password">Současné heslo</string>
+  <string name="new_password">Nové heslo</string>
+  <string name="password_should_not_be_empty">Heslo nemá být prázdné</string>
+  <string name="enable_all_accounts">Povolit všechny účty</string>
+  <string name="disable_all_accounts">Vypnout všechny účty</string>
+  <string name="perform_action_with">Provést akci s</string>
+  <string name="no_affiliation">Nepřidružený</string>
+  <string name="no_role">Bez role</string>
+  <string name="outcast">Vyloučený</string>
+  <string name="member">Člen</string>
+  <string name="advanced_mode">Pokročilý mód</string>
+  <string name="grant_membership">Povolit členství</string>
+  <string name="remove_membership">Odebrat členství</string>
+  <string name="grant_admin_privileges">Povolit administrátorská oprávnění</string>
+  <string name="remove_admin_privileges">Odebrat administrátorská oprávnění</string>
+  <string name="remove_from_room">Odebrat z konference</string>
+  <string name="could_not_change_affiliation">Nelze změnit připojení uživatele %s</string>
+  <string name="ban_from_conference">Vypovědět z konference</string>
+  <string name="removing_from_public_conference">Pokoušíte se vyhodit %s z veřejné konference. Lze to provést jedině trvalým vypovězením uživatele.</string>
+  <string name="ban_now">Vypovědět</string>
+  <string name="could_not_change_role">Nelze změnit roli uživatele %s</string>
+  <string name="public_conference">Veřejně přístupná konference</string>
+  <string name="private_conference">Soukromá konference pouze pro členy</string>
+  <string name="conference_options">Nastavení konference</string>
+  <string name="members_only">Soukromá (pouze členové)</string>
+  <string name="non_anonymous">Neanonymní</string>
+  <string name="modified_conference_options">Nastavení konference upravena!</string>
+  <string name="could_not_modify_conference_options">Nepodařilo se upravit nastavení konference!</string>
+  <string name="never">Nikdy</string>
+  <string name="thirty_minutes">30 minut</string>
+  <string name="one_hour">jedna hodina</string>
+  <string name="two_hours">2 hodiny</string>
+  <string name="eight_hours">8 hodin</string>
+  <string name="until_further_notice">Než opět změním</string>
+  <string name="pref_input_options">Nastavení zadávání</string>
+  <string name="pref_enter_is_send">Enter odesílá</string>
+  <string name="pref_enter_is_send_summary">Použít klávesu enter pro odesílání zpráv</string>
+  <string name="pref_display_enter_key">Zobrazit klávesu enter</string>
+  <string name="pref_display_enter_key_summary">Změnit klávesu emotikon na klávesu enter</string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">obrázek</string>
+  <string name="pdf_document">dokument PDF</string>
+  <string name="apk">Aplikace pro Android</string>
+  <string name="vcard">Kontakt</string>
+  <string name="received_x_file">%s přijat</string>
+  <string name="disable_foreground_service">Vypnout službu v popředí</string>
+  <string name="touch_to_open_conversations">Ťuknout pro otevření Konverzace</string>
+  <string name="avatar_has_been_published">Avatar byl zveřejněn!</string>
+  <string name="sending_x_file">Odesílám %s</string>
+  <string name="offering_x_file">Nabízím %s</string>
 </resources>
diff --git a/src/main/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml
deleted file mode 100644
index ed5d47b5..00000000
--- a/src/main/res/values-de/arrays.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mobile</item>
-        <item>Phone</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>nie</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 Minuten</item>
-        <item>1 Stunde</item>
-        <item>2 Stunden</item>
-        <item>8 Stunden</item>
-        <item>bis auf Widerruf</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 72352e7d..8cd837d2 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="action_settings">Einstellungen</string>
     <string name="action_add">Neue Unterhaltung</string>
     <string name="action_accounts">Konten verwalten</string>
     <string name="action_end_conversation">Unterhaltung beenden</string>
     <string name="action_contact_details">Kontaktdetails</string>
-    <string name="action_muc_details">Konferenzdetails</string>
+  <string name="action_muc_details">Konferenz-Details</string>
     <string name="action_secure">Verschlüsselte Unterhaltung</string>
     <string name="action_add_account">Konto hinzufügen</string>
     <string name="action_edit_contact">Name bearbeiten</string>
@@ -17,9 +17,8 @@
     <string name="action_unblock_domain">Domain entsperren</string>
     <string name="title_activity_manage_accounts">Konten verwalten</string>
     <string name="title_activity_settings">Einstellungen</string>
-    <string name="title_activity_conference_details">Konferenzdetails</string>
+  <string name="title_activity_conference_details">Konferenz-Details</string>
     <string name="title_activity_contact_details">Kontaktdetails</string>
-    <string name="title_activity_conversations">Conversations</string>
     <string name="title_activity_sharewith">Mit Unterhaltung teilen</string>
     <string name="title_activity_start_conversation">Beginne Unterhaltung</string>
     <string name="title_activity_choose_contact">Kontakt auswählen</string>
@@ -28,8 +27,8 @@
     <string name="minute_ago">vor einer Minute</string>
     <string name="minutes_ago">vor %d Minuten</string>
     <string name="unread_conversations">ungelesene Unterhaltungen</string>
-    <string name="sending">senden&#8230;</string>
-    <string name="encrypted_message">Entschlüssele Nachricht. Bitte warten&#8230;</string>
+  <string name="sending">Senden…</string>
+  <string name="encrypted_message">Entschlüssele Nachricht. Bitte warten…</string>
     <string name="nick_in_use">Nickname wird bereits verwendet</string>
     <string name="admin">Administrator</string>
     <string name="owner">Eigentümer</string>
@@ -45,7 +44,7 @@
     <string name="remove_bookmark_text">Möchtest du das Lesezeichen %s entfernen? Die Unterhaltung mit diesem Lesezeichen wird dabei nicht entfernt.</string>
     <string name="register_account">Neues Konto auf dem Server erstellen</string>
     <string name="change_password_on_server">Passwort ändern</string>
-    <string name="share_with">Teile mit&#8230;</string>
+  <string name="share_with">Teile mit…</string>
     <string name="start_conversation">Beginne Unterhaltung</string>
     <string name="invite_contact">Kontakt einladen</string>
     <string name="contacts">Kontakte</string>
@@ -70,7 +69,6 @@
     <string name="add_contact">Kontakt hinzufügen</string>
     <string name="send_failed">Zustellung nicht erfolgreich</string>
     <string name="send_rejected">abgelehnt</string>
-    <string name="receiving_image">Empfange Bild (%1$d%% heruntergeladen)</string>
     <string name="preparing_image">Bereite Bild für die Übertragung vor</string>
     <string name="action_clear_history">Verlauf löschen</string>
     <string name="clear_conversation_history">Unterhaltungsverlauf löschen</string>
@@ -83,27 +81,24 @@
     <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string>
     <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
     <string name="download_image">Bild herunterladen</string>
-    <string name="image_offered_for_download"><i>Bilddatei zum Download angeboten</i></string>
     <string name="send_unencrypted">Unverschlüsselt verschicken</string>
     <string name="decryption_failed">Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel.</string>
     <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long">Conversations benutzt eine Drittanwendung namens <b>OpenKeychain</b>, um Nachrichten zu ver- und entschlüsseln und um deine Schlüssel zu verwalten.\n\nOpenKeychain ist GPLv3-lizenziert und kann über F-Droid oder Google Play bezogen werden.\n\n<small>(Bitte starte Conversations danach neu.)</small></string>
     <string name="restart">Neustarten</string>
     <string name="install">Installieren</string>
-    <string name="offering">angeboten&#8230;</string>
-    <string name="waiting">warten&#8230;</string>
+  <string name="offering">angeboten…</string>
+  <string name="waiting">warten…</string>
     <string name="no_pgp_key">Kein OpenPGP-Schlüssel gefunden</string>
     <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge OpenPGP einrichten.</small></string>
     <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
     <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil deine Kontakte ihre Schlüssel nicht preisgeben.\n\n<small>Bitte sag deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
     <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier, um sie anzuzeigen und zu entschlüsseln.</i></string>
-    <string name="encrypted_image_received"><i>Verschlüsseltes Bild erhalten. Drücke hier, um es anzuzeigen und zu entschlüsseln.</i></string>
-    <string name="image_file"><i>Bild erhalten. Drücke hier, um es anzuzeigen.</i></string>
     <string name="pref_general">Allgemeines</string>
     <string name="pref_xmpp_resource">XMPP-Ressource</string>
     <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
     <string name="pref_accept_files">Dateiannahme</string>
-    <string name="pref_accept_files_summary">Dateien, die kleiner sind als &#8230;, automatisch annehmen</string>
+  <string name="pref_accept_files_summary">Dateien, die kleiner sind als …, automatisch annehmen</string>
     <string name="pref_notification_settings">Benachrichtigungen</string>
     <string name="pref_notifications">Benachrichtigungen</string>
     <string name="pref_notifications_summary">Benachrichtige mich, wenn eine neue Nachricht ankommt</string>
@@ -112,14 +107,14 @@
     <string name="pref_sound">Klingelton</string>
     <string name="pref_sound_summary">Spiele Klingelton, wenn eine neue Nachricht ankommt</string>
     <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string>
-    <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenznachricht und nicht nur, wenn ich angesprochen werde</string>
+  <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenz-Nachricht und nicht nur, wenn ich angesprochen werde</string>
     <string name="pref_notification_grace_period">Gnadenfrist</string>
     <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
     <string name="pref_advanced_options">Erweiterte Optionen</string>
     <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
     <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
     <string name="pref_confirm_messages">Lesebestätigung senden</string>
-    <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfängst oder liest</string>
+  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string>
     <string name="pref_ui_options">Benutzeroberfläche</string>
     <string name="pref_parse_emoticons">Smilies ersetzen</string>
     <string name="pref_parse_emoticons_summary">Zeige Smilie-Bilder anstelle von Emoticons.</string>
@@ -135,8 +130,8 @@
     <string name="send_presence_updates">Anwesenheitsbenachrichtigungen senden</string>
     <string name="receive_presence_updates">Empfange Anwesenheitsbenachrichtigungen</string>
     <string name="ask_for_presence_updates">Frage um Erlaubnis, Anwesenheitsbenachrichtigungen sehen zu dürfen</string>
-    <string name="attach_choose_picture">Foto auswählen</string>
-    <string name="attach_take_picture">Foto aufnehmen</string>
+  <string name="attach_choose_picture">Bild auswählen</string>
+  <string name="attach_take_picture">Bild aufnehmen</string>
     <string name="preemptively_grant">Erlaube Statusanfrage vorab</string>
     <string name="error_not_an_image_file">Die ausgewählte Datei ist kein Bild</string>
     <string name="error_compressing_image">Fehler beim Umwandeln des Bildes</string>
@@ -167,7 +162,7 @@
     <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
     <string name="mgmt_account_enable">Anschalten</string>
     <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
-    <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löscht, gehen alle Gesprächsverläufe verloren</string>
+  <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löschst, gehen alle Gesprächsverläufe verloren</string>
     <string name="attach_record_voice">Sprache aufzeichnen</string>
     <string name="account_settings_jabber_id">Jabber-ID:</string>
     <string name="account_settings_password">Passwort:</string>
@@ -190,13 +185,13 @@
     <string name="server_info_show_more">Server Info</string>
     <string name="server_info_mam">XEP-0313: MAM</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_csi">XEP-0352: CSI</string>
     <string name="server_info_blocking">XEP-0191: Blocking Command</string>
     <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatare)</string>
-    <string name="server_info_available">verfügbar</string>
-    <string name="server_info_unavailable">nicht verfügbar</string>
+  <string name="server_info_available">ja</string>
+  <string name="server_info_unavailable">nein</string>
     <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string>
     <string name="last_seen_now">online</string>
     <string name="last_seen_min">vor einer Minute gesehen</string>
@@ -217,42 +212,42 @@
     <string name="conferences">Konferenzen</string>
     <string name="search">Suche</string>
     <string name="create_contact">Kontakt erstellen</string>
-    <string name="join_conference">Konferenz beitreten</string>
+  <string name="join_conference">Konferenz betreten</string>
     <string name="delete_contact">Kontakt löschen</string>
     <string name="view_contact_details">Kontaktdetails anzeigen</string>
     <string name="block_contact">Kontakt sperren</string>
-    <string name="unblock_contact">Kontakte entsperren</string>
+  <string name="unblock_contact">Kontakt entsperren</string>
     <string name="create">Erstellen</string>
     <string name="contact_already_exists">Der Kontakt existiert bereits</string>
     <string name="join">Beitreten</string>
-    <string name="conference_address">Konferenzadresse</string>
+  <string name="conference_address">Konferenz-Adresse</string>
     <string name="conference_address_example">raum@conference.example.com</string>
     <string name="save_as_bookmark">Als Lesezeichen speichern</string>
     <string name="delete_bookmark">Lesezeichen löschen</string>
     <string name="bookmark_already_exists">Das Lesezeichen existiert bereits</string>
     <string name="you">Du</string>
-    <string name="action_edit_subject">Konferenzthema anpassen</string>
+  <string name="action_edit_subject">Konferenz-Thema anpassen</string>
     <string name="conference_not_found">Konferenz nicht gefunden</string>
     <string name="leave">Verlassen</string>
     <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
     <string name="add_back">Auch hinzufügen</string>
     <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
     <string name="publish">Veröffentlichen</string>
-    <string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
+  <string name="touch_to_choose_picture">Hier klicken, um einen Avatar auszuwählen</string>
     <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
-    <string name="publishing">Veröffentliche&#8230;</string>
+  <string name="publishing">Veröffentliche…</string>
     <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Avatars abgelehnt.</string>
     <string name="error_publish_avatar_converting">Bei der Konvertierung des Avatars lief etwas schief.</string>
     <string name="error_saving_avatar">Kann Avatar nicht speichern.</string>
     <string name="or_long_press_for_default">(Oder klicke lange, um Standard wiederherzustellen)</string>
     <string name="error_publish_avatar_no_server_support">Dein Server unterstützt die Veröffentlichung von Avataren nicht.</string>
     <string name="private_message">private Nachricht</string>
-    <string name="private_message_to">an %s</string>
+  <string name="private_message_to">an %s:</string>
     <string name="send_private_message_to">Sende private Nachricht an %s</string>
     <string name="connect">Verbinden</string>
     <string name="account_already_exists">Das Konto existiert bereits</string>
     <string name="next">Weiter</string>
-    <string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
+  <string name="server_info_session_established">Sitzung wiederhergestellt</string>
     <string name="additional_information">Zusätzliche Informationen</string>
     <string name="skip">Überspringen</string>
     <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
@@ -273,8 +268,6 @@
     <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
     <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
     <string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string>
-    <string name="pref_enable_legacy_ssl">Alte SSL-Version aktivieren</string>
-    <string name="pref_enable_legacy_ssl_summary">Aktiviert SSLv3-Unterstützung für alte Server. Achtung: SSLv3 ist unsicher.</string>
     <string name="pref_expert_options">Einstellungen für Experten</string>
     <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
     <string name="title_activity_about">Über Conversations</string>
@@ -287,16 +280,16 @@
     <string name="pref_use_larger_font">Schrift vergrößern</string>
     <string name="pref_use_larger_font_summary">Größere Schrift verwenden</string>
     <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
     <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
     <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
     <string name="pref_expert_options_other">Sonstiges</string>
     <string name="pref_conference_name">Konferenz-Name</string>
     <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
     <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string>
-    <string name="conference_banned">Du wurdest aus dem Konferenzraum verbannt</string>
-    <string name="conference_members_only">Der Konferenzraum ist nur für Mitglieder</string>
-    <string name="conference_kicked">Du wurdest aus dem Konferenzraum geworfen</string>
+  <string name="conference_banned">Du wurdest von der Konferenz ausgeschlossen</string>
+  <string name="conference_members_only">Die Konferenz ist nur für Mitglieder</string>
+  <string name="conference_kicked">Du wurdest aus der Konferenz geworfen</string>
     <string name="using_account">Verwende Konto %s</string>
     <string name="checking_image">Prüfe Bild auf HTTP-Host</string>
     <string name="image_file_deleted">Bild wurde gelöscht</string>
@@ -304,7 +297,6 @@
     <string name="check_image_filesize">Bildgröße prüfen</string>
     <string name="message_options">Nachrichtenoptionen</string>
     <string name="copy_text">Text kopieren</string>
-    <string name="share_image">Bild teilen</string>
     <string name="copy_original_url">Original-URL kopieren</string>
     <string name="send_again">Erneut senden</string>
     <string name="image_url">Bild-URL</string>
@@ -331,20 +323,19 @@
     <string name="try_again">Erneut versuchen</string>
     <string name="finish">Fertig</string>
     <string name="verified">Überprüft!</string>
-    <string name="smp_requested">Kontakt forder SMP Überprüfung an</string>
+  <string name="smp_requested">Kontakt fordert eine Überprüfung an</string>
     <string name="no_otr_session_found">Keine gültige OTR Sitzung gefunden!</string>
     <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Berühren, um den Vordergrund-Dient zu deaktiveren.</string>
     <string name="pref_keep_foreground_service">Den Dienst im Vordergrund ausführen.</string>
-    <string name="pref_keep_foreground_service_summary">Verhindert, dass das Betriebssystem die Verbindung unterbricht</string>
+  <string name="pref_keep_foreground_service_summary">Verhindert, dass Android die Verbindung unterbricht</string>
     <string name="choose_file">Datei auswählen</string>
-    <string name="receiving_file">Empfange %1$s Datei (%2$d%% heruntergeladen)</string>
-    <string name="download_file">Download %s Datei</string>
-    <string name="open_file">Öffne %s Datei</string>
-    <string name="sending_file">sende (%1$d%% gesendet)</string>
+  <string name="receiving_x_file">Empfange  %1$s (%2$d%% abgeschlossen)</string>
+  <string name="download_x_file">Lade %s herunter</string>
+  <string name="file">Datei</string>
+  <string name="open_x_file">Öffne %s</string>
+  <string name="sending_file">Sende (%1$d%% gesendet)</string>
     <string name="preparing_file">Bereite Datei für die Übertragung vor</string>
-    <string name="file_offered_for_download">Datei zum Download angeboten</string>
-    <string name="file">%s Datei</string>
+  <string name="x_file_offered_for_download">%s zum Herunterladen angeboten</string>
     <string name="cancel_transmission">Datei-Übertragung abbrechen</string>
     <string name="file_transmission_failed">Datei-Übertragung fehlgeschlagen</string>
     <string name="file_deleted">Datei wurde gelöscht</string>
@@ -355,7 +346,7 @@
     <string name="pref_show_dynamic_tags">Dynamische Tags anzeigen</string>
     <string name="pref_show_dynamic_tags_summary">Zeige schreibgeschützte Tags unterhalb der Kontakte</string>
     <string name="enable_notifications">Aktiviere Benachrichtigungen</string>
-    <string name="conference_with">Starte Konferenze mit&#8230;</string>
+  <string name="conference_with">Starte Konferenz mit…</string>
     <string name="no_conference_server_found">Konferenz-Server kann nicht gefunden werden</string>
     <string name="conference_creation_failed">Starten der Konferenz fehlgeschlagen!</string>
     <string name="conference_created">Konferenz erstellt!</string>
@@ -363,9 +354,9 @@
     <string name="reset">Zurücksetzen</string>
     <string name="account_image_description">Konto-Avatar</string>
     <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string>
-    <string name="fetching_history_from_server">Hole Chatverlauf vom Server</string>
-    <string name="no_more_history_on_server">Keine weiteren Nachrichten auf dem Server vorhanden.</string>
-    <string name="updating">Aktualisiere&#8230;</string>
+  <string name="fetching_history_from_server">Lade Chatverlauf</string>
+  <string name="no_more_history_on_server">Keine weiteren Nachrichten vorhanden</string>
+  <string name="updating">Aktualisiere…</string>
     <string name="password_changed">Passwort geändert.</string>
     <string name="could_not_change_password">Passwort kann nicht geändert werden.</string>
     <string name="otr_session_not_started">Sende eine Nachricht, um eine verschlüsselte Unterhaltung zu beginnen</string>
@@ -382,4 +373,50 @@
     <string name="enable_all_accounts">Alle Konten anschalten</string>
 	<string name="disable_all_accounts">Alle Konten abschalten</string>
     <string name="perform_action_with">Aktion durchführen mit</string>
+  <string name="no_affiliation">Keine Zugehörigkeit</string>
+  <string name="no_role">Keine Rolle</string>
+  <string name="outcast">Ausgeschlossen</string>
+  <string name="member">Mitglied</string>
+  <string name="advanced_mode">Experten Modus</string>
+  <string name="grant_membership">Mitgliedschaft gewähren</string>
+  <string name="remove_membership">Mitgliedschaft entziehen</string>
+  <string name="grant_admin_privileges">Administratorrechte gewähren</string>
+  <string name="remove_admin_privileges">Administratorrechte entziehen</string>
+  <string name="remove_from_room">Aus Konferenz entfernen</string>
+  <string name="could_not_change_affiliation">Zugehörigkeit von %s konnte nicht verändert werden</string>
+  <string name="ban_from_conference">Von Konferenz ausschließen</string>
+  <string name="removing_from_public_conference">Du versuchst %s aus einer öffentlichen Konferenz zu entfernen. Die einzige Möglichkeit, dies dauerhaft zu tun, ist den Kontakt von dieser Konferenz auszuschließen.</string>
+  <string name="ban_now">Kontakt ausschließen</string>
+  <string name="could_not_change_role">Rolle von %s konnte nicht geändert werden</string>
+  <string name="public_conference">Öffentlich zugängliche Konferenz</string>
+  <string name="private_conference">Private Konferenz nur für Mitglieder</string>
+  <string name="conference_options">Konferenzoptionen</string>
+  <string name="members_only">Privat (Nur für Mitglieder)</string>
+  <string name="non_anonymous">De-anonymisiert</string>
+  <string name="modified_conference_options">Konferenzoptionen wurden modifiziert!</string>
+  <string name="could_not_modify_conference_options">Konferenzoptionen konnten nicht modifiziert werden</string>
+  <string name="never">Niemals</string>
+  <string name="thirty_minutes">30 Minuten</string>
+  <string name="one_hour">1 Stunde</string>
+  <string name="two_hours">2 Stunden</string>
+  <string name="eight_hours">8 Stunden</string>
+  <string name="until_further_notice">Bis auf weiters</string>
+  <string name="pref_input_options">Eingabeoptionen</string>
+  <string name="pref_enter_is_send">Eingabetaste sendet Nachricht</string>
+  <string name="pref_enter_is_send_summary">Benutze die Eingabetaste zum Senden einer Nachricht</string>
+  <string name="pref_display_enter_key">Zeige Enter-Taste</string>
+  <string name="pref_display_enter_key_summary">Zeige die Enter-Taste anstelle der Smiley-Taste</string>
+  <string name="audio">Audio</string>
+  <string name="video">Video</string>
+  <string name="image">Bild</string>
+  <string name="pdf_document">PDF-Dokument</string>
+  <string name="apk">Android App</string>
+  <string name="vcard">Kontakt</string>
+  <string name="received_x_file">%s empfangen</string>
+  <string name="disable_foreground_service">Vordergrund-Dienst beenden</string>
+  <string name="touch_to_open_conversations">Tippen, um Conversations zu öffnen</string>
+  <string name="avatar_has_been_published">Avatar wurde gespeichert</string>
+  <string name="sending_x_file">Sende %s</string>
+  <string name="offering_x_file">%s angeboten</string>
+  <string name="hide_offline">verstecke offline</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/src/main/res/values-el/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-es/arrays.xml b/src/main/res/values-es/arrays.xml
deleted file mode 100644
index 15231955..00000000
--- a/src/main/res/values-es/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Móvil</item>
-        <item>Teléfono</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>nunca</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minutos</item>
-        <item>1 hora</item>
-        <item>2 horas</item>
-        <item>8 horas</item>
-        <item>Hasta nuevo aviso</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d47a3adc..579a226d 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1,370 +1,420 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Ajustes</string>
-    <string name="action_add">Nueva conversación</string>
-    <string name="action_accounts">Gestionar cuentas</string>
-    <string name="action_end_conversation">Terminar conversación</string>
-    <string name="action_contact_details">Detalles del contacto</string>
-    <string name="action_muc_details">Detalles de conversación en grupo</string>
-    <string name="action_secure">Conversación segura</string>
-    <string name="action_add_account">Añadir cuenta</string>
-    <string name="action_edit_contact">Editar contacto</string>
-    <string name="action_delete_contact">Eliminar contacto de la lista</string>
-    <string name="action_add_phone_book">Añadir a contactos del teléfono</string>
-    <string name="action_block_contact">Bloquear contacto</string>
-    <string name="action_unblock_contact">Desbloquear contacto</string>
-    <string name="action_block_domain">Bloquear dominio</string>
-    <string name="action_unblock_domain">Desbloquear dominio</string>
-    <string name="title_activity_manage_accounts">Gestionar Cuentas</string>
-    <string name="title_activity_settings">Ajustes</string>
-    <string name="title_activity_conference_details">Detalles de Conversación en grupo</string>
-    <string name="title_activity_contact_details">Detalles del Contacto</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Compartir con Conversación</string>
-    <string name="title_activity_start_conversation">Nueva Conversación</string>
-    <string name="title_activity_choose_contact">Elegir Contacto</string>
-    <string name="title_activity_block_list">Lista contactos bloqueados</string>
-    <string name="just_now">ahora</string>
-    <string name="minute_ago">hace 1 min</string>
-    <string name="minutes_ago">hace %d min</string>
-    <string name="unread_conversations">conversaciones por leer</string>
-    <string name="sending">enviando&#8230;</string>
-    <string name="encrypted_message">Desencriptando mensaje. Espera por favor&#8230;</string>
-    <string name="nick_in_use">El apodo ya está en uso</string>
-    <string name="admin">Administrador</string>
-    <string name="owner">Propietario</string>
-    <string name="moderator">Moderador</string>
-    <string name="participant">Participante</string>
-    <string name="visitor">Visitante</string>
-    <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string>
-    <string name="block_contact_text">¿Quieres bloquear a %s para que no pueda enviarte mensajes?</string>
-    <string name="unblock_contact_text">¿Quieres desbloquear a %s y permitirle que te envíe mensajes?</string>
-    <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string>
-    <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string>
-    <string name="contact_blocked">Contacto bloqueado</string>
-    <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string>
-    <string name="register_account">Registrar nueva cuenta en servidor</string>
-    <string name="change_password_on_server">Cambiar contraseña</string>
-    <string name="share_with">Compartir con</string>
-    <string name="start_conversation">Comenzar conversación</string>
-    <string name="invite_contact">Invitar contactos</string>
-    <string name="contacts">Contactos</string>
-    <string name="cancel">Cancelar</string>
-    <string name="set">Establecer</string>
-    <string name="add">Añadir</string>
-    <string name="edit">Editar</string>
-    <string name="delete">Eliminar</string>
-    <string name="block">Bloquear</string>
-    <string name="unblock">Desbloquear</string>
-    <string name="save">Guardar</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Conversations se ha detenido.</string>
-    <string name="crash_report_message">Si envías un informe de fallos ayudas al desarrollo de Conversations\n<b>Aviso:</b> Esto usará tu cuenta XMPP para enviar los registros de error al desarrollador.</string>
-    <string name="send_now">Enviar ahora</string>
-    <string name="send_never">No preguntar de nuevo</string>
-    <string name="problem_connecting_to_account">No se ha podido conectar a la cuenta</string>
-    <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string>
-    <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string>
-    <string name="attach_file">Adjuntar</string>
-    <string name="not_in_roster">El contacto no está en tu lista. ¿Te gustaría añadirlo?</string>
-    <string name="add_contact">Añadir contacto</string>
-    <string name="send_failed">Error al enviar</string>
-    <string name="send_rejected">rechazado</string>
-    <string name="receiving_image">Recibiendo archivo de imagen. Espera por favor&#8230;</string>
-    <string name="preparing_image">Preparando imagen para enviar</string>
-    <string name="action_clear_history">Limpiar historial</string>
-    <string name="clear_conversation_history">Limpiar historial de conversación</string>
-    <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
-    <string name="delete_messages">Borrar mensajes</string>
-    <string name="also_end_conversation">Además, terminar esta conversación</string>
-    <string name="choose_presence">Selecciona recurso del contacto</string>
-    <string name="send_plain_text_message">Enviar mensaje de texto</string>
-    <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
-    <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
-    <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
-    <string name="download_image">Descargar imagen</string>
-    <string name="image_offered_for_download"><i>Archivo de imagen ofrecido para descarga</i></string>
-    <string name="send_unencrypted">Enviar sin encriptar</string>
-    <string name="decryption_failed">Falló la desencriptación. Tal vez no tengas la clave privada apropiada.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para encriptar y desencriptar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
-    <string name="restart">Reiniciar</string>
-    <string name="install">Instalar</string>
-    <string name="offering">ofreciendo&#8230;</string>
-    <string name="waiting">esperando&#8230;</string>
-    <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
-    <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
-    <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
-    <string name="contacts_have_no_pgp_keys">Conversations no ha podido encriptar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Mensaje cifrado recibido. Pulsa para ver.</i></string>
-    <string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string>
-    <string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string>
-    <string name="pref_general">General</string>
-    <string name="pref_xmpp_resource">Recurso</string>
-    <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
-    <string name="pref_accept_files">Aceptar archivos</string>
-    <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que&#8230;</string>
-    <string name="pref_notification_settings">Ajustes de notificación</string>
-    <string name="pref_notifications">Notificaciones</string>
-    <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
-    <string name="pref_vibrate">Vibrar</string>
-    <string name="pref_vibrate_summary">Vibra cuando llega un nuevo mensaje</string>
-    <string name="pref_sound">Sonido</string>
-    <string name="pref_sound_summary">Reproduce tono con la notificación</string>
-    <string name="pref_conference_notifications">Notif. conversación grupo</string>
-    <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo y no solo cuando llega un mensaje destacado</string>
-    <string name="pref_notification_grace_period">Notificaciones Carbons</string>
-    <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
-    <string name="pref_advanced_options">Opciones avanzadas</string>
-    <string name="pref_never_send_crash">Nunca informar de errores</string>
-    <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
-    <string name="pref_confirm_messages">Confirmar Mensajes</string>
-    <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
-    <string name="pref_ui_options">Opciones de interfaz</string>
-    <string name="openpgp_error">OpenKeychain reportó un error</string>
-    <string name="error_decrypting_file">Error desencriptando fichero</string>
-    <string name="accept">Aceptar</string>
-    <string name="error">Ha ocurrido un error</string>
-    <string name="pref_grant_presence_updates">Suscripción de presencia</string>
-    <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string>
-    <string name="subscriptions">Suscripciones</string>
-    <string name="your_account">Tu cuenta</string>
-    <string name="keys">Claves</string>
-    <string name="send_presence_updates">Enviar actualizaciones de presencia</string>
-    <string name="receive_presence_updates">Recibir actualizaciones de presencia</string>
-    <string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string>
-    <string name="attach_choose_picture">Seleccionar imagen</string>
-    <string name="attach_take_picture">Hacer foto</string>
-    <string name="preemptively_grant">De forma automática conceder solicitud de suscripción</string>
-    <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
-    <string name="error_compressing_image">Error comprimiendo el archivo de imagen</string>
-    <string name="error_file_not_found">Archivo no encontrado</string>
-    <string name="error_io_exception">Error general. ¿Puede que no tengas espacio en disco?</string>
-    <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar imágenes no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de ficheros diferente para seleccionar la imagen</small></string>
-    <string name="account_status_unknown">Desconocido</string>
-    <string name="account_status_disabled">Deshabilitado temporalmente</string>
-    <string name="account_status_online">Conectado</string>
-    <string name="account_status_connecting">Conectando\u2026</string>
-    <string name="account_status_offline">Desconectado</string>
-    <string name="account_status_unauthorized">No autorizado</string>
-    <string name="account_status_not_found">Servidor no encontrado</string>
-    <string name="account_status_no_internet">Sin conectividad</string>
-    <string name="account_status_regis_fail">Error en el registro</string>
-    <string name="account_status_regis_conflict">El identificador ya está en uso</string>
-    <string name="account_status_regis_success">Registro completado</string>
-    <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
-    <string name="account_status_security_error">Error de seguridad</string>
-    <string name="account_status_incompatible_server">Servidor incompatible</string>
-    <string name="encryption_choice_none">Texto plano</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Editar cuenta</string>
-    <string name="mgmt_account_delete">Eliminar cuenta</string>
-    <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
-    <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
-    <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
-    <string name="mgmt_account_enable">Habilitar</string>
-    <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
-    <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
-    <string name="attach_record_voice">Grabar audio</string>
-    <string name="account_settings_jabber_id">Identificador Jabber</string>
-    <string name="account_settings_password">Contraseña</string>
-    <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
-    <string name="account_settings_confirm_password">Confirmar contraseña</string>
-    <string name="password">Contraseña</string>
-    <string name="confirm_password">Confirmar contraseña</string>
-    <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
-    <string name="invalid_jid">El identificador no es un identificador de Jabber válido</string>
-    <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
-    <string name="add_phone_book_text">¿Te gustaría añadir a %s a tus contactos del teléfono?</string>
-    <string name="contact_status_online">Disponible</string>
-    <string name="contact_status_free_to_chat">Hablador</string>
-    <string name="contact_status_away">Ausente</string>
-    <string name="contact_status_extended_away">Ausencia extendida</string>
-    <string name="contact_status_do_not_disturb">No molestar</string>
-    <string name="contact_status_offline">Desconectado</string>
-    <string name="muc_details_conference">Conversación en grupo</string>
-    <string name="muc_details_other_members">Otros Miembros</string>
-    <string name="server_info_show_more">Información de servidor</string>
-    <string name="server_info_mam">XEP-0313: MAM</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_csi">XEP-0352: Client State Indication</string>
-    <string name="server_info_blocking">XEP-0191: Blocking Command</string>
-    <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">Disponible</string>
-    <string name="server_info_unavailable">No disponible</string>
-    <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string>
-    <string name="last_seen_now">Visto última vez ahora</string>
-    <string name="last_seen_min">Visto última vez hace 1 minuto</string>
-    <string name="last_seen_mins">Visto última vez hace %d minutos</string>
-    <string name="last_seen_hour">Visto última vez hace 1 hora</string>
-    <string name="last_seen_hours">Visto última vez hace %d horas</string>
-    <string name="last_seen_day">Visto última vez hace 1 día</string>
-    <string name="last_seen_days">Visto última vez hace %d días</string>
-    <string name="never_seen">Nunca visto</string>
-    <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para desencriptar.</string>
-    <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string>
-    <string name="openpgp_messages_found">Encontrado mensaje cifrado con OpenPGP</string>
-    <string name="reception_failed">Error al recibir</string>
-    <string name="your_fingerprint">Tu huella digital</string>
-    <string name="otr_fingerprint">Huella digital OTR</string>
-    <string name="verify">Verificar</string>
-    <string name="decrypt">Desencriptar</string>
-    <string name="conferences">Conversación Grupo</string>
-    <string name="search">Buscar</string>
-    <string name="create_contact">Crear Contacto</string>
-    <string name="join_conference">Unirse a Conversación en grupo</string>
-    <string name="delete_contact">Eliminar Contacto</string>
-    <string name="view_contact_details">Ver detalles del contacto</string>
-    <string name="block_contact">Bloquear contacto</string>
-    <string name="unblock_contact">Desbloquear contacto</string>
-    <string name="create">Crear</string>
-    <string name="contact_already_exists">El contacto ya existe</string>
-    <string name="join">Unirse</string>
-    <string name="conference_address">Dirección</string>
-    <string name="conference_address_example">nombre@salas.ejemplo.com</string>
-    <string name="save_as_bookmark">Guardar en marcadores</string>
-    <string name="delete_bookmark">Eliminar marcador</string>
-    <string name="bookmark_already_exists">Este marcador ya existe</string>
-    <string name="you">Tú</string>
-    <string name="action_edit_subject">Editar asunto de la conversación</string>
-    <string name="conference_not_found">Conversación en grupo no encontrada</string>
-    <string name="leave">Salir</string>
-    <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
-    <string name="add_back">Añadir contacto</string>
-    <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
-    <string name="publish">Publicar</string>
-    <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
-    <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
-    <string name="publishing">Publicando&#8230;</string>
-    <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
-    <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
-    <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
-    <string name="or_long_press_for_default">(O pulsación prolongada para volver a tu imagen de la agenda)</string>
-    <string name="error_publish_avatar_no_server_support">Tu servidor no soporta la publicación de imágenes de perfil</string>
-    <string name="private_message">en privado</string>
-    <string name="private_message_to">en privado para %s</string>
-    <string name="send_private_message_to">Enviar mensaje privado a %s</string>
-    <string name="connect">Conectar</string>
-    <string name="account_already_exists">Esta cuenta ya existe</string>
-    <string name="next">Siguiente</string>
-    <string name="server_info_session_established">Inicio sesión actual</string>
-    <string name="additional_information">Información adicional</string>
-    <string name="skip">Omitir</string>
-    <string name="disable_notifications">Deshabilitar notificaciones</string>
-    <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string>
-    <string name="notifications_disabled">Las notificaciones están deshabilitadas</string>
-    <string name="enable">Habilitar</string>
-    <string name="conference_requires_password">La conversación en grupo requiere contraseña</string>
-    <string name="enter_password">Introduce la contraseña</string>
-    <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string>
-    <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string>
-    <string name="request_now">Solicitar ahora</string>
-    <string name="delete_fingerprint">Eliminar huella digital OTR</string>
-    <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string>
-    <string name="ignore">Ignorar</string>
-    <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string>
-    <string name="pref_encryption_settings">Ajustes de encriptación</string>
-    <string name="pref_force_encryption">Forzar cifrado end-to-end</string>
-    <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string>
-    <string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string>
-    <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
-    <string name="pref_enable_legacy_ssl">Habilitar SSL heredado</string>
-    <string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string>
-    <string name="pref_expert_options">Ajustes avanzados</string>
-    <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
-    <string name="title_activity_about">Acerca de Conversations</string>
-    <string name="pref_about_conversations_summary">Información de compilación y licencia</string>
-    <string name="title_pref_quiet_hours">Horario de silencio</string>
-    <string name="title_pref_quiet_hours_start_time">Hora de comienzo</string>
-    <string name="title_pref_quiet_hours_end_time">Hora de fin</string>
-    <string name="title_pref_enable_quiet_hours">Habilitar horario de silencio</string>
-    <string name="pref_quiet_hours_summary">Las notificaciones serán silenciadas durante el horario de silencio</string>
-    <string name="pref_use_larger_font">Tamaño de fuente grande</string>
-    <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
-    <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
-    <string name="pref_use_indicate_received">Solicitar entrega de mensaje</string>
-    <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
-    <string name="pref_expert_options_other">Otros</string>
-    <string name="pref_conference_name">Nombre conversación grupo</string>
-    <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string>
-    <string name="toast_message_otr_fingerprint">¡Huella digital OTR copiada al portapapeles!</string>
-    <string name="conference_banned">Tu entrada a esta conversación ha sido prohibida</string>
-    <string name="conference_members_only">Esta conversación es solo para miembros</string>
-    <string name="conference_kicked">Has sido expulsado de esta conversación</string>
-    <string name="using_account">Usando cuenta %s</string>
-    <string name="checking_image">Comprobando imagen en servidor HTTP</string>
-    <string name="image_file_deleted">El archivo de imagen ha sido eliminado</string>
-    <string name="not_connected_try_again">No estás conectado. Inténtalo más tarde</string>
-    <string name="check_image_filesize">Comprobar el tamaño del archivo de imagen</string>
-    <string name="message_options">Opciones de mensaje</string>
-    <string name="copy_text">Copiar texto</string>
-    <string name="share_image">Compartir imagen</string>
-    <string name="copy_original_url">Copiar URL original</string>
-    <string name="send_again">Volver a enviar</string>
-    <string name="image_url">URL Imagen</string>
-    <string name="message_text">Mensaje de texto</string>
-    <string name="url_copied_to_clipboard">URL copiada al portapapeles</string>
-    <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string>
-    <string name="image_transmission_failed">Falló la transferencia de la imagen</string>
-    <string name="scan_qr_code">Escanear código QR</string>
-    <string name="show_qr_code">Mostrar código QR</string>
-    <string name="show_block_list">Mostrar contactos bloqueados</string>
-    <string name="account_details">Detalles de la cuenta</string>
-    <string name="verify_otr">Verificar OTR</string>
-    <string name="remote_fingerprint">Huella digital remota</string>
-    <string name="scan">escanear</string>
-    <string name="or_touch_phones">(o une los teléfonos)</string>
-    <string name="smp">Protocolo del Socialista Millonario</string>
-    <string name="shared_secret_hint">Sugerencia o pregunta</string>
-    <string name="shared_secret_secret">Secreto compartido</string>
-    <string name="confirm">Confirmar</string>
-    <string name="in_progress">En progreso</string>
-    <string name="respond">Responder</string>
-    <string name="failed">Falló</string>
-    <string name="secrets_do_not_match">Los secretos no coinciden</string>
-    <string name="try_again">Intentar de nuevo</string>
-    <string name="finish">Terminar</string>
-    <string name="verified">Verificado!</string>
-    <string name="smp_requested">El contacto solicita verificación SMP</string>
-    <string name="no_otr_session_found">¡No se ha encontrado una sesión OTR válida!</string>
-    <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Pulsa para deshabilitar servicio en primer plano</string>
-    <string name="pref_keep_foreground_service">Servicio en primer plano</string>
-    <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
-    <string name="choose_file">Seleccionar archivo</string>
-    <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completado)</string>
-    <string name="download_file">Descargar archivo %s</string>
-    <string name="open_file">Abrir archivo %s</string>
-    <string name="sending_file">Enviando (%1$d%% completado)</string>
-    <string name="preparing_file">Preparando transferencia de archivo</string>
-    <string name="file_offered_for_download">Archivo ofrecido para descarga</string>
-    <string name="file">Archivo %s</string>
-    <string name="cancel_transmission">Cancelar transferencia</string>
-    <string name="file_transmission_failed">falló la transferencia del archivo</string>
-    <string name="file_deleted">El archivo ha sido eliminado</string>
-    <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string>
-    <string name="could_not_verify_fingerprint">No se puede verificar el contacto</string>
-    <string name="manually_verify">Verificar manualmente</string>
-    <string name="are_you_sure_verify_fingerprint">¿Estás seguro de que quieres verificar el contacto?</string>
-    <string name="pref_show_dynamic_tags">Mostrar etiquetas</string>
-    <string name="pref_show_dynamic_tags_summary">Muestra información en forma de etiquetas debajo de los contactos</string>
-    <string name="enable_notifications">Habilitar notificaciones</string>
-    <string name="conference_with">Crear conversación en grupo</string>
-    <string name="no_conference_server_found">No se ha encontrado el servidor para crear la conversación en grupo</string>
-    <string name="conference_creation_failed">¡La creación de la conversación en grupo ha fallado!</string>
-    <string name="conference_created">¡Conversación en grupo creada!</string>
-    <string name="secret_accepted">¡Secreto aceptado!</string>
-    <string name="reset">Reinicializar</string>
-    <string name="account_image_description">Imagen de perfil</string>
-    <string name="copy_otr_clipboard_description">Copiar huella digital OTR al portapapeles</string>
-    <string name="fetching_history_from_server">Buscar historial en servidor</string>
-    <string name="no_more_history_on_server">No más historial del servidor</string>
-    <string name="updating">Actualizando…</string>
-    <string name="password_changed">!Contraseña cambiada!</string>
-    <string name="could_not_change_password">No se puede cambiar la contraseña</string>
+  <string name="action_settings">Ajustes</string>
+  <string name="action_add">Nueva conversación</string>
+  <string name="action_accounts">Gestionar cuentas</string>
+  <string name="action_end_conversation">Terminar conversación</string>
+  <string name="action_contact_details">Detalles del contacto</string>
+  <string name="action_muc_details">Detalles de conversación</string>
+  <string name="action_secure">Conversación segura</string>
+  <string name="action_add_account">Añadir cuenta</string>
+  <string name="action_edit_contact">Editar contacto</string>
+  <string name="action_add_phone_book">Añadir a contactos del teléfono</string>
+  <string name="action_delete_contact">Eliminar contacto de la lista</string>
+  <string name="action_block_contact">Bloquear contacto</string>
+  <string name="action_unblock_contact">Desbloquear contacto</string>
+  <string name="action_block_domain">Bloquear dominio</string>
+  <string name="action_unblock_domain">Desbloquear dominio</string>
+  <string name="title_activity_manage_accounts">Gestionar Cuentas</string>
+  <string name="title_activity_settings">Ajustes</string>
+  <string name="title_activity_conference_details">Detalles de Conversación</string>
+  <string name="title_activity_contact_details">Detalles del Contacto</string>
+  <string name="title_activity_sharewith">Compartir con Conversación</string>
+  <string name="title_activity_start_conversation">Nueva Conversación</string>
+  <string name="title_activity_choose_contact">Elegir contacto</string>
+  <string name="title_activity_block_list">Lista contactos bloqueados</string>
+  <string name="just_now">ahora</string>
+  <string name="minute_ago">hace 1 min</string>
+  <string name="minutes_ago">hace %d min</string>
+  <string name="unread_conversations">conversaciones por leer</string>
+  <string name="sending">enviando…</string>
+  <string name="encrypted_message">Descifrando mensaje. Espera por favor…</string>
+  <string name="nick_in_use">El apodo ya está en uso</string>
+  <string name="admin">Administrador</string>
+  <string name="owner">Propietario</string>
+  <string name="moderator">Moderador</string>
+  <string name="participant">Participante</string>
+  <string name="visitor">Visitante</string>
+  <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string>
+  <string name="block_contact_text">¿Quieres bloquear a %s para que no pueda enviarte mensajes?</string>
+  <string name="unblock_contact_text">¿Quieres desbloquear a %s y permitirle que te envíe mensajes?</string>
+  <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string>
+  <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string>
+  <string name="contact_blocked">Contacto bloqueado</string>
+  <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string>
+  <string name="register_account">Registrar nueva cuenta en servidor</string>
+  <string name="change_password_on_server">Cambiar contraseña en servidor</string>
+  <string name="share_with">Compartir con...</string>
+  <string name="start_conversation">Comenzar conversación</string>
+  <string name="invite_contact">Invitar contacto</string>
+  <string name="contacts">Contactos</string>
+  <string name="cancel">Cancelar</string>
+  <string name="set">Establecer</string>
+  <string name="add">Añadir</string>
+  <string name="edit">Editar</string>
+  <string name="delete">Eliminar</string>
+  <string name="block">Bloquear</string>
+  <string name="unblock">Desbloquear</string>
+  <string name="save">Guardar</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Conversations se ha detenido.</string>
+  <string name="crash_report_message">Si envías informes de fallos ayudas al desarrollo de Conversations\n<b>Aviso:</b> Esto usará tu cuenta XMPP para enviar los registros de error al desarrollador.</string>
+  <string name="send_now">Enviar ahora</string>
+  <string name="send_never">No preguntar de nuevo</string>
+  <string name="problem_connecting_to_account">No se ha podido conectar a la cuenta</string>
+  <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string>
+  <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string>
+  <string name="attach_file">Adjuntar</string>
+  <string name="not_in_roster">El contacto no está en tu lista. ¿Quieres añadirlo?</string>
+  <string name="add_contact">Añadir contacto</string>
+  <string name="send_failed">Error al enviar</string>
+  <string name="send_rejected">rechazado</string>
+  <string name="preparing_image">Preparando imagen para enviar</string>
+  <string name="action_clear_history">Limpiar historial</string>
+  <string name="clear_conversation_history">Limpiar historial de conversación</string>
+  <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
+  <string name="delete_messages">Borrar mensajes</string>
+  <string name="also_end_conversation">Además, terminar esta conversación</string>
+  <string name="choose_presence">Selecciona recurso del contacto</string>
+  <string name="send_plain_text_message">Enviar mensaje de texto</string>
+  <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
+  <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
+  <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
+  <string name="download_image">Descargar imagen</string>
+  <string name="send_unencrypted">Enviar sin cifrar</string>
+  <string name="decryption_failed">Falló el descifrado. Tal vez no tengas la clave privada apropiada.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para cifrar y descifrar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
+  <string name="restart">Reiniciar</string>
+  <string name="install">Instalar</string>
+  <string name="offering">ofreciendo…</string>
+  <string name="waiting">esperando…</string>
+  <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
+  <string name="contact_has_no_pgp_key">Conversations no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
+  <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
+  <string name="contacts_have_no_pgp_keys">Conversations no ha podido cifrar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Mensaje cifrado recibido. Pulsa para ver.</i></string>
+  <string name="pref_general">General</string>
+  <string name="pref_xmpp_resource">Recurso</string>
+  <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
+  <string name="pref_accept_files">Aceptar archivos</string>
+  <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que…</string>
+  <string name="pref_notification_settings">Ajustes de notificación</string>
+  <string name="pref_notifications">Notificaciones</string>
+  <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
+  <string name="pref_vibrate">Vibrar</string>
+  <string name="pref_vibrate_summary">Vibra cuando llega un nuevo mensaje</string>
+  <string name="pref_sound">Sonido</string>
+  <string name="pref_sound_summary">Reproduce tono con la notificación</string>
+  <string name="pref_conference_notifications">Notif. conversación grupo</string>
+  <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo y no solo cuando alguien menciona tu nombre en un mensaje</string>
+  <string name="pref_notification_grace_period">Notificaciones Carbons</string>
+  <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
+  <string name="pref_advanced_options">Opciones avanzadas</string>
+  <string name="pref_never_send_crash">Nunca informar de errores</string>
+  <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
+  <string name="pref_confirm_messages">Confirmar Mensajes</string>
+  <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
+  <string name="pref_ui_options">Opciones de interfaz</string>
+  <string name="openpgp_error">OpenKeychain reportó un error</string>
+  <string name="error_decrypting_file">Error descifrando archivo</string>
+  <string name="accept">Aceptar</string>
+  <string name="error">Ha ocurrido un error</string>
+  <string name="pref_grant_presence_updates">Suscripción de presencia</string>
+  <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string>
+  <string name="subscriptions">Suscripciones</string>
+  <string name="your_account">Tu cuenta</string>
+  <string name="keys">Claves</string>
+  <string name="send_presence_updates">Enviar actualizaciones de presencia</string>
+  <string name="receive_presence_updates">Recibir actualizaciones de presencia</string>
+  <string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string>
+  <string name="attach_choose_picture">Seleccionar imagen</string>
+  <string name="attach_take_picture">Hacer foto</string>
+  <string name="preemptively_grant">De forma automática conceder suscripción de presencia</string>
+  <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
+  <string name="error_compressing_image">Error comprimiendo el archivo de imagen</string>
+  <string name="error_file_not_found">Archivo no encontrado</string>
+  <string name="error_io_exception">Error general. ¿Es posible que no tengas espacio en disco?</string>
+  <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar esta imagen no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de archivos diferente para seleccionar la imagen</small></string>
+  <string name="account_status_unknown">Desconocido</string>
+  <string name="account_status_disabled">Deshabilitado temporalmente</string>
+  <string name="account_status_online">Conectado</string>
+  <string name="account_status_connecting">Conectando\u2026</string>
+  <string name="account_status_offline">Desconectado</string>
+  <string name="account_status_unauthorized">No autorizado</string>
+  <string name="account_status_not_found">Servidor no encontrado</string>
+  <string name="account_status_no_internet">Sin conectividad</string>
+  <string name="account_status_regis_fail">Error en el registro</string>
+  <string name="account_status_regis_conflict">El identificador ya está en uso</string>
+  <string name="account_status_regis_success">Registro completado</string>
+  <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
+  <string name="account_status_security_error">Error de seguridad</string>
+  <string name="account_status_incompatible_server">Servidor incompatible</string>
+  <string name="encryption_choice_none">Texto plano</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Editar cuenta</string>
+  <string name="mgmt_account_delete">Eliminar cuenta</string>
+  <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
+  <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
+  <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
+  <string name="mgmt_account_enable">Habilitar</string>
+  <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
+  <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
+  <string name="attach_record_voice">Grabar audio</string>
+  <string name="account_settings_jabber_id">Identificador Jabber</string>
+  <string name="account_settings_password">Contraseña</string>
+  <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
+  <string name="account_settings_confirm_password">Confirmar contraseña</string>
+  <string name="password">Contraseña</string>
+  <string name="confirm_password">Confirmar contraseña</string>
+  <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
+  <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
+  <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
+  <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos del teléfono?</string>
+  <string name="contact_status_online">Disponible</string>
+  <string name="contact_status_free_to_chat">Hablador</string>
+  <string name="contact_status_away">Ausente</string>
+  <string name="contact_status_extended_away">Ausencia extendida</string>
+  <string name="contact_status_do_not_disturb">No molestar</string>
+  <string name="contact_status_offline">Desconectado</string>
+  <string name="muc_details_conference">Conversación en grupo</string>
+  <string name="muc_details_other_members">Otros Miembros</string>
+  <string name="server_info_show_more">Información de servidor</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">Sí</string>
+  <string name="server_info_unavailable">No</string>
+  <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string>
+  <string name="last_seen_now">Visto última vez ahora</string>
+  <string name="last_seen_min">Visto última vez hace 1 minuto</string>
+  <string name="last_seen_mins">Visto última vez hace %d minutos</string>
+  <string name="last_seen_hour">Visto última vez hace 1 hora</string>
+  <string name="last_seen_hours">Visto última vez hace %d horas</string>
+  <string name="last_seen_day">Visto última vez hace 1 día</string>
+  <string name="last_seen_days">Visto última vez hace %d días</string>
+  <string name="never_seen">Nunca visto</string>
+  <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para descifrar.</string>
+  <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string>
+  <string name="openpgp_messages_found">Encontrado mensaje cifrado con OpenPGP</string>
+  <string name="reception_failed">Error al recibir</string>
+  <string name="your_fingerprint">Tu huella digital</string>
+  <string name="otr_fingerprint">Huella digital OTR</string>
+  <string name="verify">Verificar</string>
+  <string name="decrypt">Descifrar</string>
+  <string name="conferences">Conversación Grupo</string>
+  <string name="search">Buscar</string>
+  <string name="create_contact">Crear Contacto</string>
+  <string name="join_conference">Unirse a Conversación en grupo</string>
+  <string name="delete_contact">Eliminar Contacto</string>
+  <string name="view_contact_details">Ver detalles del contacto</string>
+  <string name="block_contact">Bloquear contacto</string>
+  <string name="unblock_contact">Desbloquear contacto</string>
+  <string name="create">Crear</string>
+  <string name="contact_already_exists">El contacto ya existe</string>
+  <string name="join">Unirse</string>
+  <string name="conference_address">Dirección</string>
+  <string name="conference_address_example">nombre@salas.ejemplo.com</string>
+  <string name="save_as_bookmark">Guardar en marcadores</string>
+  <string name="delete_bookmark">Eliminar marcador</string>
+  <string name="bookmark_already_exists">Este marcador ya existe</string>
+  <string name="you">Tú</string>
+  <string name="action_edit_subject">Editar asunto de la conversación</string>
+  <string name="conference_not_found">Conversación no encontrada</string>
+  <string name="leave">Salir</string>
+  <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
+  <string name="add_back">Añadir contacto</string>
+  <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
+  <string name="publish">Publicar</string>
+  <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
+  <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
+  <string name="publishing">Publicando…</string>
+  <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
+  <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
+  <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
+  <string name="or_long_press_for_default">(O pulsación prolongada para volver a tu imagen de la agenda)</string>
+  <string name="error_publish_avatar_no_server_support">Tu servidor no soporta la publicación de imágenes de perfil</string>
+  <string name="private_message">en privado</string>
+  <string name="private_message_to">en privado para %s</string>
+  <string name="send_private_message_to">Enviar mensaje privado a %s</string>
+  <string name="connect">Conectar</string>
+  <string name="account_already_exists">Esta cuenta ya existe</string>
+  <string name="next">Siguiente</string>
+  <string name="server_info_session_established">Inicio sesión actual</string>
+  <string name="additional_information">Información adicional</string>
+  <string name="skip">Omitir</string>
+  <string name="disable_notifications">Deshabilitar notificaciones</string>
+  <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string>
+  <string name="notifications_disabled">Las notificaciones están deshabilitadas</string>
+  <string name="enable">Habilitar</string>
+  <string name="conference_requires_password">Esta conversación requiere contraseña</string>
+  <string name="enter_password">Introduce la contraseña</string>
+  <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string>
+  <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string>
+  <string name="request_now">Solicitar ahora</string>
+  <string name="delete_fingerprint">Eliminar huella digital OTR</string>
+  <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string>
+  <string name="ignore">Ignorar</string>
+  <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string>
+  <string name="pref_encryption_settings">Ajustes de cifrado</string>
+  <string name="pref_force_encryption">Forzar cifrado end-to-end</string>
+  <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string>
+  <string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string>
+  <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
+  <string name="pref_expert_options">Ajustes avanzados</string>
+  <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
+  <string name="title_activity_about">Acerca de Conversations</string>
+  <string name="pref_about_conversations_summary">Información de compilación y licencia</string>
+  <string name="title_pref_quiet_hours">Horario de silencio</string>
+  <string name="title_pref_quiet_hours_start_time">Hora de comienzo</string>
+  <string name="title_pref_quiet_hours_end_time">Hora de fin</string>
+  <string name="title_pref_enable_quiet_hours">Habilitar horario de silencio</string>
+  <string name="pref_quiet_hours_summary">Las notificaciones serán silenciadas durante el horario de silencio</string>
+  <string name="pref_use_larger_font">Tamaño de fuente grande</string>
+  <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
+  <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
+  <string name="pref_use_indicate_received">Solicitar entrega de mensaje</string>
+  <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
+  <string name="pref_expert_options_other">Otros</string>
+  <string name="pref_conference_name">Nombre conversación grupo</string>
+  <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string>
+  <string name="toast_message_otr_fingerprint">¡Huella digital OTR copiada al portapapeles!</string>
+  <string name="conference_banned">Tu entrada a esta conversación ha sido prohibida</string>
+  <string name="conference_members_only">Esta conversación es solo para miembros</string>
+  <string name="conference_kicked">Has sido expulsado de esta conversación</string>
+  <string name="using_account">Usando cuenta %s</string>
+  <string name="checking_image">Comprobando imagen en servidor HTTP</string>
+  <string name="image_file_deleted">El archivo de imagen ha sido eliminado</string>
+  <string name="not_connected_try_again">No estás conectado. Inténtalo más tarde</string>
+  <string name="check_image_filesize">Comprobar el tamaño del archivo de imagen</string>
+  <string name="message_options">Opciones de mensaje</string>
+  <string name="copy_text">Copiar texto</string>
+  <string name="copy_original_url">Copiar URL original</string>
+  <string name="send_again">Volver a enviar</string>
+  <string name="image_url">URL Imagen</string>
+  <string name="message_text">Mensaje de texto</string>
+  <string name="url_copied_to_clipboard">URL copiada al portapapeles</string>
+  <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string>
+  <string name="image_transmission_failed">Falló la transferencia de la imagen</string>
+  <string name="scan_qr_code">Escanear código QR</string>
+  <string name="show_qr_code">Mostrar código QR</string>
+  <string name="show_block_list">Mostrar contactos bloqueados</string>
+  <string name="account_details">Detalles de la cuenta</string>
+  <string name="verify_otr">Verificar OTR</string>
+  <string name="remote_fingerprint">Huella digital remota</string>
+  <string name="scan">escanear</string>
+  <string name="or_touch_phones">(o une los teléfonos)</string>
+  <string name="smp">Protocolo del Socialista Millonario</string>
+  <string name="shared_secret_hint">Sugerencia o pregunta</string>
+  <string name="shared_secret_secret">Secreto compartido</string>
+  <string name="confirm">Confirmar</string>
+  <string name="in_progress">En progreso</string>
+  <string name="respond">Responder</string>
+  <string name="failed">Falló</string>
+  <string name="secrets_do_not_match">Los secretos no coinciden</string>
+  <string name="try_again">Intentar de nuevo</string>
+  <string name="finish">Terminar</string>
+  <string name="verified">¡Verificado!</string>
+  <string name="smp_requested">El contacto solicita verificación SMP</string>
+  <string name="no_otr_session_found">¡No se ha encontrado una sesión OTR válida!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Servicio en primer plano</string>
+  <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
+  <string name="choose_file">Seleccionar archivo</string>
+  <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
+  <string name="download_x_file">Descargar %s</string>
+  <string name="file">archivo</string>
+  <string name="open_x_file">Abrir %s</string>
+  <string name="sending_file">Enviando (%1$d%% completado)</string>
+  <string name="preparing_file">Preparando transferencia de archivo</string>
+  <string name="x_file_offered_for_download">%s ofrecido para descarga</string>
+  <string name="cancel_transmission">Cancelar transferencia</string>
+  <string name="file_transmission_failed">falló la transferencia del archivo</string>
+  <string name="file_deleted">El archivo ha sido eliminado</string>
+  <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string>
+  <string name="could_not_verify_fingerprint">No se puede verificar el contacto</string>
+  <string name="manually_verify">Verificar manualmente</string>
+  <string name="are_you_sure_verify_fingerprint">¿Estás seguro de que quieres verificar el contacto?</string>
+  <string name="pref_show_dynamic_tags">Mostrar etiquetas</string>
+  <string name="pref_show_dynamic_tags_summary">Muestra información en forma de etiquetas debajo de los contactos</string>
+  <string name="enable_notifications">Habilitar notificaciones</string>
+  <string name="conference_with">Crear conversación en grupo</string>
+  <string name="no_conference_server_found">No se ha encontrado el servidor para crear la conversación</string>
+  <string name="conference_creation_failed">¡La creación de la conversación ha fallado!</string>
+  <string name="conference_created">¡Conversación en grupo creada!</string>
+  <string name="secret_accepted">¡Secreto aceptado!</string>
+  <string name="reset">Reinicializar</string>
+  <string name="account_image_description">Imagen de perfil</string>
+  <string name="copy_otr_clipboard_description">Copiar huella digital OTR al portapapeles</string>
+  <string name="fetching_history_from_server">Buscando historial en el servidor</string>
+  <string name="no_more_history_on_server">No hay más historial en el servidor</string>
+  <string name="updating">Actualizando…</string>
+  <string name="password_changed">¡Contraseña cambiada!</string>
+  <string name="could_not_change_password">No se puede cambiar la contraseña</string>
+  <string name="otr_session_not_started">Enviar mensaje para empezar una conversación cifrada</string>
+  <string name="ask_question">Haz una pregunta</string>
+  <string name="smp_explain_question">Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como un pequeño juego o broma o simplemente lo que tomasteis para comer la última vez os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas.</string>
+  <string name="smp_explain_answer">Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Te hace la siguiente sugerencia o pregunta para ese secreto.</string>
+  <string name="shared_secret_hint_should_not_be_empty">La pregunta no puede ser vacía</string>
+  <string name="shared_secret_can_not_be_empty">El secreto compartido no puede ser vacío</string>
+  <string name="manual_verification_explanation">Compara detenidamente la huella digital mostrada abajo con la de tu contacto.\nPuedes usar cualquier forma de comunicación segura como un correo electrónico cifrado o conversación telefónica para verificarlo.</string>
+  <string name="change_password">Cambiar contraseña</string>
+  <string name="current_password">Contraseña actual</string>
+  <string name="new_password">Nueva contraseña</string>
+  <string name="password_should_not_be_empty">La contraseña no puede ser vacía</string>
+  <string name="enable_all_accounts">Habilitar todas las cuentas</string>
+  <string name="disable_all_accounts">Deshabilitar todas las cuentas</string>
+  <string name="perform_action_with">Realizar acción con</string>
+  <string name="no_affiliation">Sin afiliación</string>
+  <string name="no_role">Sin rol</string>
+  <string name="outcast">Rechazado</string>
+  <string name="member">Miembro</string>
+  <string name="advanced_mode">Modo avanzado</string>
+  <string name="grant_membership">Convertir en miembro</string>
+  <string name="remove_membership">Revocar membresía</string>
+  <string name="grant_admin_privileges">Conceder privilegios de administrador</string>
+  <string name="remove_admin_privileges">Revocar privilegios de administrador</string>
+  <string name="remove_from_room">Expulsar de la conversación</string>
+  <string name="could_not_change_affiliation">No se puede cambiar la afiliación de %s</string>
+  <string name="ban_from_conference">Prohibir entrada en la conversación</string>
+  <string name="removing_from_public_conference">Estás intentando expulsar a %s de una conversación de acceso público. La única forma de hacer esto es prohibir su entrada para siempre.</string>
+  <string name="ban_now">Prohibir ahora</string>
+  <string name="could_not_change_role">No se puede cambiar el rol de %s</string>
+  <string name="public_conference">Conversación de acceso público</string>
+  <string name="private_conference">Conversación privada solo para miembros</string>
+  <string name="conference_options">Opciones de conversación</string>
+  <string name="members_only">Privada (solo miembros)</string>
+  <string name="non_anonymous">No anónima</string>
+  <string name="modified_conference_options">¡Modificadas las opciones de la conversación!</string>
+  <string name="could_not_modify_conference_options">No se pueden modificar las opciones de la conversación</string>
+  <string name="never">Nunca</string>
+  <string name="thirty_minutes">30 minutos</string>
+  <string name="one_hour">1 hora</string>
+  <string name="two_hours">2 horas</string>
+  <string name="eight_hours">8 horas</string>
+  <string name="until_further_notice">Hasta nuevo aviso</string>
+  <string name="pref_input_options">Opciones de entrada</string>
+  <string name="pref_enter_is_send">Intro para enviar</string>
+  <string name="pref_enter_is_send_summary">Usar la tecla intro para enviar el mensaje</string>
+  <string name="pref_display_enter_key">Mostrar tecla Intro</string>
+  <string name="pref_display_enter_key_summary">Cambia la tecla de emoticonos por la tecla Intro</string>
+  <string name="audio">audio</string>
+  <string name="video">vídeo</string>
+  <string name="image">imagen</string>
+  <string name="pdf_document">documento PDF</string>
+  <string name="apk">Android App</string>
+  <string name="vcard">Contacto</string>
+  <string name="received_x_file">Recibido %s</string>
+  <string name="disable_foreground_service">Deshabilitar servicio en primer plano</string>
+  <string name="touch_to_open_conversations">Pulsa para abrir Conversations</string>
+  <string name="avatar_has_been_published">¡La imagen de perfil ha sido publicada!</string>
+  <string name="sending_x_file">Enviando %s</string>
+  <string name="offering_x_file">Ofreciendo %s</string>
+  <string name="hide_offline">Ocultar desconectados</string>
 </resources>
diff --git a/src/main/res/values-eu/arrays.xml b/src/main/res/values-eu/arrays.xml
deleted file mode 100644
index a34d3c6a..00000000
--- a/src/main/res/values-eu/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mugikorra</item>
-        <item>Telefonoa</item>
-        <item>Tableta</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>inoiz</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minutu</item>
-        <item>ordu bat</item>
-        <item>2 ordu</item>
-        <item>8 ordu</item>
-        <item>abisatu arte</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 04388f4f..a55e3f87 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -1,337 +1,419 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Ezarpenak</string>
-    <string name="action_add">Elkarrizketa berria</string>
-    <string name="action_accounts">Kontuak kudeatu</string>
-    <string name="action_end_conversation">Elkarrizketa hau amaitu</string>
-    <string name="action_contact_details">Kontaktuaren xehetasunak</string>
-    <string name="action_muc_details">Konferentziaren xehetasunak</string>
-    <string name="action_secure">Elkarrizketa segurua</string>
-    <string name="action_add_account">Kontua gehitu</string>
-    <string name="action_edit_contact">Izena editatu</string>
-    <string name="action_add_phone_book">Telefono kontaktuetara gehitu</string>
-    <string name="action_delete_contact">Zerrendatik ezabatu</string>
-    <string name="title_activity_manage_accounts">Kontuak kudeatu</string>
-    <string name="title_activity_settings">Ezarpenak</string>
-    <string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
-    <string name="title_activity_contact_details">Kontaktuaren xehetasunak</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string>
-    <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
-    <string name="title_activity_choose_contact">Kontaktua hautatu</string>
-    <string name="just_now">orain</string>
-    <string name="minute_ago">min 1 lehenago</string>
-    <string name="minutes_ago">%d min lehenago</string>
-    <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
-    <string name="sending">bidaltzen&#8230;</string>
-    <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron&#8230;</string>
-    <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
-    <string name="admin">Administratzailea</string>
-    <string name="owner">Jabea</string>
-    <string name="moderator">Moderatzailea</string>
-    <string name="participant">Parte-hartzailea</string>
-    <string name="visitor">Bisitaria</string>
-    <string name="remove_contact_text">%s zure zerrendatik ezabatu nahi duzu? Kontu honekin lotutako elkarrizketa ez da ezabatuko.</string>
-    <string name="remove_bookmark_text">%s laster-marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string>
-    <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
-    <string name="share_with">Honekin partekatu</string>
-    <string name="start_conversation">Elkarrizketa hasi</string>
-    <string name="invite_contact">Kontaktu bat gonbidatu</string>
-    <string name="contacts">Kontaktuak</string>
-    <string name="cancel">Utzi</string>
-    <string name="add">Gehitu</string>
-    <string name="edit">Editatu</string>
-    <string name="delete">Ezabatu</string>
-    <string name="save">Gorde</string>
-    <string name="ok">Ados</string>
-    <string name="crash_report_title">Conversations gelditu da</string>
-    <string name="crash_report_message">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu\n<b>Abisua:</b> Honek zure XMPP kontua erabiliko du garatzaileari akats harraska bidaltzeko.</string>
-    <string name="send_now">Bidali orain</string>
-    <string name="send_never">Ez galdetu berriz</string>
-    <string name="problem_connecting_to_account">Ezin izan da kontura konektatu</string>
-    <string name="problem_connecting_to_accounts">Ezin izan da hainbat kontuetara konektatu</string>
-    <string name="touch_to_fix">Ukitu hemen zure kontuak kudeatzeko</string>
-    <string name="attach_file">Fitxategia erantsi</string>
-    <string name="not_in_roster">Kontaktua ez dago zure zerrendan. Gehitu nahiko al zenuke?</string>
-    <string name="add_contact">Kontaktua gehitu</string>
-    <string name="send_failed">huts bidaltzerakoan</string>
-    <string name="send_rejected">ukatua</string>
-    <string name="receiving_image">Irudi fitxategia jasotzen. Mesedez itxaron&#8230;</string>
-    <string name="preparing_image">Irudia transmisiorako prestatzen. Mesedez itxaron&#8230;</string>
-    <string name="action_clear_history">Historia garbitu</string>
-    <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
-    <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
-    <string name="delete_messages">Mezuak ezabatu</string>
-    <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
-    <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
-    <string name="send_plain_text_message">Testu mezua bidali</string>
-    <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
-    <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
-    <string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
-    <string name="download_image">Irudia deskargatu</string>
-    <string name="image_offered_for_download"><i>Irudi fitxategia deskargarako eskeinia</i></string>
-    <string name="send_unencrypted">Enkriptatu gabe bidali</string>
-    <string name="decryption_failed">Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversationsek <b>OpenKeychain</b> izeneko hirugarren app bat erabiltzen du mezuak enkriptatu eta desenkriptatzeko eta zure gako publikoak kudeatzeko.\n\nOpenKeychain GPLv3 lizentziapean dago eta F-Droid eta Google Playn eskura daiteke.\n\n<small>(Mesedez ondoren Conversations berrabiarazi)</small></string>
-    <string name="restart">Berrabiarazi</string>
-    <string name="install">Instalatu</string>
-    <string name="offering">eskeintzen&#8230;</string>
-    <string name="waiting">itxaroten&#8230;</string>
-    <string name="no_pgp_key">Ez da OpenPGP gakorik aurkitu</string>
-    <string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
-    <string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
-    <string name="contacts_have_no_pgp_keys">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktuak haien gako publikoa jakinarazten ez daudelako.\n\n<small>Mesedez eskatu ezaiezu zure kontakuei OpenPGP konfigura dezaten.</small></string>
-    <string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
-    <string name="encrypted_image_received"><i>Enkriptatutako irudia jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
-    <string name="image_file"><i>Irudia jaso da. Ukitu ikusteko</i></string>
-    <string name="pref_general">Orokorrak</string>
-    <string name="pref_xmpp_resource">XMPP baliabidea</string>
-    <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
-    <string name="pref_accept_files">Fitxategiak onartu</string>
-    <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu&#8230;</string>
-    <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string>
-    <string name="pref_notifications">Jakinarazpenak</string>
-    <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
-    <string name="pref_vibrate">Dardaratu</string>
-    <string name="pref_vibrate_summary">Dardaratu ere mezu berri bat heltzerakoan</string>
-    <string name="pref_sound">Soinua</string>
-    <string name="pref_sound_summary">Dei-tonua jo jakinarazpenarekin</string>
-    <string name="pref_conference_notifications">Konferentzien jakinarazpenak</string>
-    <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string>
-    <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
-    <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
-    <string name="pref_advanced_options">Aukera aurreratuak</string>
-    <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
-    <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
-    <string name="pref_confirm_messages">Mezuak egiaztatu</string>
-    <string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string>
-    <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
-    <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
-    <string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
-    <string name="accept">Onartu</string>
-    <string name="error">Akats bat gertatu da</string>
-    <string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string>
-    <string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string>
-    <string name="subscriptions">Harpidetzak</string>
-    <string name="your_account">Zure kontua</string>
-    <string name="keys">Gakoak</string>
-    <string name="send_presence_updates">Presentzia eguneraketak bidali</string>
-    <string name="receive_presence_updates">Presentzia eguneraketak jaso</string>
-    <string name="ask_for_presence_updates">Presentzia eguneraketak eskatu</string>
-    <string name="attach_choose_picture">Argazkia aukeratu</string>
-    <string name="attach_take_picture">Argazkia egin</string>
-    <string name="preemptively_grant">Prebentiboki harpidetza eskaera eman</string>
-    <string name="error_not_an_image_file">Aukeratu duzun fitxategia ez da irudi bat</string>
-    <string name="error_compressing_image">Huts irudi fitxategia bihurtzerakoan</string>
-    <string name="error_file_not_found">Fitxategia ez da aurkitu</string>
-    <string name="error_io_exception">Sarrera/Irteera akats orokorra. Agian biltegian lekurik gabe gelditu zara?</string>
-    <string name="error_security_exception_during_image_copy">Irudi hau aukeratzeko erabili duzun aplikazioak ez digu fitxategia irakurtzeko baimen nahikorik eman.\n\n<small>Beste fitxategi kudeatzaile bat erabili ezazu irudia aukeratzeko</small></string>
-    <string name="account_status_unknown">Ezezaguna</string>
-    <string name="account_status_disabled">Aldi baterako ezgaituta</string>
-    <string name="account_status_online">Konektatuta</string>
-    <string name="account_status_connecting">Konektatzen\u2026</string>
-    <string name="account_status_offline">Lineaz kanpo</string>
-    <string name="account_status_unauthorized">Ez baimenduta</string>
-    <string name="account_status_not_found">Zerbitzaria ez da aurkitu</string>
-    <string name="account_status_no_internet">Konektagarritasunik ez</string>
-    <string name="account_status_regis_fail">Erregistroak huts egin du</string>
-    <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string>
-    <string name="account_status_regis_success">Erregistroa burutu da</string>
-    <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
-    <string name="account_status_security_error">Segurtasun akatsa</string>
-    <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
-    <string name="encryption_choice_none">Testu laua</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Kontua editatu</string>
-    <string name="mgmt_account_delete">Kontua ezabatu</string>
-    <string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
-    <string name="mgmt_account_publish_avatar">Profileko argazkia argitaratu</string>
-    <string name="mgmt_account_publish_pgp">OpenPGP gako publikoa argitaratu</string>
-    <string name="mgmt_account_enable">Kontua gaitu</string>
-    <string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
-    <string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu zure elkarrizketa historia guztia galduko da</string>
-    <string name="attach_record_voice">Ahotsa grabatu</string>
-    <string name="account_settings_jabber_id">Jabber IDa</string>
-    <string name="account_settings_password">Pasahitza</string>
-    <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
-    <string name="account_settings_confirm_password">Pasahitza egiaztatu</string>
-    <string name="password">Pasahitza</string>
-    <string name="confirm_password">Pasahitza egiaztatu</string>
-    <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
-    <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
-    <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
-    <string name="add_phone_book_text">%s zure telefono kontaktu zerrendara gehitu nahi al duzu?</string>
-    <string name="contact_status_online">konektatuta</string>
-    <string name="contact_status_free_to_chat">hitzegiteko aske</string>
-    <string name="contact_status_away">kanpoan</string>
-    <string name="contact_status_extended_away">luzerako kanpoan</string>
-    <string name="contact_status_do_not_disturb">ez gogaitu</string>
-    <string name="contact_status_offline">lineaz kanpo</string>
-    <string name="muc_details_conference">Konferentzia</string>
-    <string name="muc_details_other_members">Beste kideak</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Profileko argazkiak)</string>
-    <string name="server_info_available">eskuragarri</string>
-    <string name="server_info_unavailable">ez eskuragarri</string>
-    <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string>
-    <string name="last_seen_now">azkenengoz ikusia orain</string>
-    <string name="last_seen_mins">azkenengoz ikusia %d minutu lehenago</string>
-    <string name="last_seen_hours">azkenengoz ikusia %d ordu lehenago</string>
-    <string name="last_seen_days">azkenengoz ikusia %d egun lehenago</string>
-    <string name="never_seen">inoiz ez ikusia</string>
-    <string name="last_seen_min">azkenengoz ikusia minutu 1 lehenago</string>
-    <string name="last_seen_hour">azkenengoz ikusia ordu 1 lehenago</string>
-    <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
-    <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string>
-    <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string>
-    <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string>
-    <string name="reception_failed">Jasotzeak huts egin du</string>
-    <string name="your_fingerprint">Zure hatz-marka</string>
-    <string name="otr_fingerprint">OTR hatz-marka</string>
-    <string name="verify">Egiaztatu</string>
-    <string name="decrypt">Desenkriptatu</string>
-    <string name="conferences">Konferentziak</string>
-    <string name="search">Bilatu</string>
-    <string name="create_contact">Kontaktua sortu</string>
-    <string name="join_conference">Konferentziara batu</string>
-    <string name="delete_contact">Kontaktua ezabatu</string>
-    <string name="view_contact_details">Kontaktuaren xehetasunak ikusi</string>
-    <string name="create">Sortu</string>
-    <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string>
-    <string name="join">Batu</string>
-    <string name="conference_address">Konferentziaren helbidea</string>
-    <string name="conference_address_example">gela@conference.example.com</string>
-    <string name="save_as_bookmark">Gorde laster-marka bezala</string>
-    <string name="delete_bookmark">Laster-marka ezabatu</string>
-    <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
-    <string name="you">Zu</string>
-    <string name="action_edit_subject">Konferentziaren gaia editatu</string>
-    <string name="conference_not_found">Konferentzia ez da aurkitu</string>
-    <string name="leave">Alde egin</string>
-    <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
-    <string name="add_back">Bera gehitu</string>
-    <string name="contact_has_read_up_to_this_point">%s(e)k puntu honetaraino irakurri du</string>
-    <string name="publish">Argitaratu</string>
-    <string name="touch_to_choose_picture">Ukitu profileko argazkia irudi bat galeriatik hautatzeko</string>
-    <string name="publish_avatar_explanation">Adi: Zure presentzia eguneraketetara harpidetutako edonork irudi hau ikusi ahal izango du.</string>
-    <string name="publishing">Argitaratzen&#8230;</string>
-    <string name="error_publish_avatar_server_reject">Zerbitzariak zure argitarapena ukatu du</string>
-    <string name="error_publish_avatar_converting">Zerbait oker joan da zure irudia bihurtzerakoan</string>
-    <string name="error_saving_avatar">Ezin izan da profileko argazkia diskoan gorde</string>
-    <string name="or_long_press_for_default">(Edo sakatu luze lehenetsira bueltatzeko)</string>
-    <string name="error_publish_avatar_no_server_support">Zure zerbitzariak ez du profileko argazkien argitarapena onartzen</string>
-    <string name="private_message">xuxurlatu</string>
-    <string name="private_message_to">%s(r)i</string>
-    <string name="send_private_message_to">%s(r)i mezu pribatua bidali</string>
-    <string name="connect">Konektatu</string>
-    <string name="account_already_exists">Kontu hau existitzen da dagoeneko</string>
-    <string name="next">Hurrengoa</string>
-    <string name="server_info_session_established">Uneko saioa ezarri da</string>
-    <string name="additional_information">Informazio gehiago</string>
-    <string name="skip">Orain ez</string>
-    <string name="disable_notifications">Jakinarazpenak ezgaitu</string>
-    <string name="disable_notifications_for_this_conversation">Elkarrizketa honetarako jakinarazpenak ezgaitu</string>
-    <string name="notifications_disabled">Jakinarazpenak ezgaituta daude</string>
-    <string name="enable">Gaitu</string>
-    <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
-    <string name="enter_password">Sartu pasahitza</string>
-    <string name="missing_presence_updates">Kontaktuaren presentzia eguneraketak falta dira</string>
-    <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
-    <string name="request_now">Eskatu orain</string>
-    <string name="delete_fingerprint">Hatz-marka ezabatu</string>
-    <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
-    <string name="ignore">Kasurik ez egin</string>
-    <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
-    <string name="pref_encryption_settings">Enkriptazio ezarpenak</string>
-    <string name="pref_force_encryption">End-to-end enkriptazioa behartu</string>
-    <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
-    <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
-    <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
-    <string name="pref_enable_legacy_ssl">Oinordetutako SSL gaitu</string>
-    <string name="pref_enable_legacy_ssl_summary">SSLv3 gaitzen du oinordetutako zerbitzarietarako. Adi: SSLv3 ez segurutzat hartzen da.</string>
-    <string name="pref_expert_options">Adituentzako aukerak</string>
-    <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
-    <string name="title_activity_about">Conversationsi buruz</string>
-    <string name="pref_about_conversations_summary">Eraikitze eta lizentzia informazioa</string>
-    <string name="pref_use_larger_font">Letraren tamaina handitu</string>
-    <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
-    <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
-    <string name="pref_use_indicate_received">Mezuen jasotzea eskatu</string>
-    <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
-    <string name="pref_expert_options_other">Besteak</string>
-    <string name="pref_conference_name">Konferentziaren izena</string>
-    <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko eta ez JIDa</string>
-    <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
-    <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
-    <string name="conference_members_only">Konferentzia hau kideentzat da soilik</string>
-    <string name="conference_kicked">Konferentzia honetatik kanporatua izan zara</string>
-    <string name="using_account">%s kontua erabiltzen</string>
-    <string name="checking_image">Irudia egiaztatzen HTTP ostalarian</string>
-    <string name="image_file_deleted">Irudia ezabatu egin da</string>
-    <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string>
-    <string name="check_image_filesize">Irudiaren tamaina egiaztatu</string>
-    <string name="message_options">Mezuaren aukerak</string>
-    <string name="copy_text">Testua kopiatu</string>
-    <string name="share_image">Irudia partekatu</string>
-    <string name="copy_original_url">Jatorrizko URLa kopiatu</string>
-    <string name="send_again">Berriro bidali</string>
-    <string name="image_url">Irudiaren URLa</string>
-    <string name="message_text">Testu mezua</string>
-    <string name="url_copied_to_clipboard">URLa arbelera kopiatu da</string>
-    <string name="message_copied_to_clipboard">Mezua arbelera kopiatu da</string>
-    <string name="image_transmission_failed">Irudiaren transmisioak huts egin du</string>
-    <string name="scan_qr_code">QR kodea eskaneatu</string>
-    <string name="show_qr_code">QR kodea erakutsi</string>
-    <string name="account_details">Kontuaren xehetasunak</string>
-    <string name="verify_otr">OTR egiaztatu</string>
-    <string name="remote_fingerprint">Urruneko hatz-marka</string>
-    <string name="scan">eskaneatu</string>
-    <string name="or_touch_phones">(edo telefonoak ikutu)</string>
-    <string name="smp">Socialist Millionaire protokoloa</string>
-    <string name="shared_secret_hint">Iradokizuna edo galdera</string>
-    <string name="shared_secret_secret">Partekatutako sekretua</string>
-    <string name="confirm">Baieztatu</string>
-    <string name="in_progress">Lanean</string>
-    <string name="respond">Erantzun</string>
-    <string name="failed">Huts egin du</string>
-    <string name="secrets_do_not_match">Sekretuak ez dute bat egiten</string>
-    <string name="try_again">Saiatu berriz</string>
-    <string name="finish">Amaitu</string>
-    <string name="verified">Egiaztatuta!</string>
-    <string name="smp_requested">Kontaktuak SMP egiaztapena eskatu du</string>
-    <string name="no_otr_session_found">Ez da OTR saio baliodunik aurkitu!</string>
-    <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Ikutu atzeko planoko zerbitzua ezgaitzeko</string>
-    <string name="pref_keep_foreground_service">Zerbitzua atzeko planoan mantendu</string>
-    <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
-    <string name="choose_file">Fitxategia aukeratu</string>
-    <string name="receiving_file">%1$s fitxategia jasotzen (%2$d%% osatua)</string>
-    <string name="download_file">%s fitxategia deskargatu</string>
-    <string name="open_file">%s fitxategia ireki</string>
-    <string name="sending_file">bidaltzen (%1$d%% osatua)</string>
-    <string name="preparing_file">Fitxategia transmisiorako prestatzen</string>
-    <string name="file_offered_for_download">Fitxaegia deskargatzeko eskainita</string>
-    <string name="file">%s fitxategia</string>
-    <string name="cancel_transmission">Transmisioa utzi</string>
-    <string name="file_transmission_failed">fitxategi transmisioak huts egin du</string>
-    <string name="file_deleted">Fitxategia ezabatu egin da</string>
-    <string name="no_application_found_to_open_file">Fitxategia ireki dezakeen aplikaziorik ez da aurkitu</string>
-    <string name="could_not_verify_fingerprint">Hatz-marka ezin izan da egiaztatu</string>
-    <string name="manually_verify">Eskuz egiaztatu</string>
-    <string name="are_you_sure_verify_fingerprint">Ziur al zaude zure kontaktuaren OTR hatz-marka egiaztatu nahi duzulaz?</string>
-    <string name="pref_show_dynamic_tags">Etiketa dinamikoak erakutsi</string>
-    <string name="pref_show_dynamic_tags_summary">Irakurtzeko soilik diren etiketak erakutsi kontaktuen azpian</string>
-    <string name="enable_notifications">Jakinarazpenak gaitu</string>
-    <string name="conference_with">Konferentzia sortu honekin…</string>
-    <string name="no_conference_server_found">Ez da konferentzia zerbitzaririk aurkitu</string>
-    <string name="conference_creation_failed">Konferentzia sortzeak huts egin du!</string>
-    <string name="conference_created">Konferentzia sortu da!</string>
-    <string name="secret_accepted">Sekretua onartu da!</string>
-    <string name="reset">Berrezarri</string>
-
+  <string name="action_settings">Ezarpenak</string>
+  <string name="action_add">Elkarrizketa berria</string>
+  <string name="action_accounts">Kontuak kudeatu</string>
+  <string name="action_end_conversation">Elkarrizketa hau amaitu</string>
+  <string name="action_contact_details">Kontaktuaren xehetasunak</string>
+  <string name="action_muc_details">Konferentziaren xehetasunak</string>
+  <string name="action_secure">Elkarrizketa segurua</string>
+  <string name="action_add_account">Kontua gehitu</string>
+  <string name="action_edit_contact">Izena editatu</string>
+  <string name="action_add_phone_book">Telefono kontaktuetara gehitu</string>
+  <string name="action_delete_contact">Zerrendatik ezabatu</string>
+  <string name="action_block_contact">Kontaktua blokeatu</string>
+  <string name="action_unblock_contact">Kontaktua desblokeatu</string>
+  <string name="action_block_domain">Domeinua blokeatu</string>
+  <string name="action_unblock_domain">Domeinua desblokeatu</string>
+  <string name="title_activity_manage_accounts">Kontuak kudeatu</string>
+  <string name="title_activity_settings">Ezarpenak</string>
+  <string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
+  <string name="title_activity_contact_details">Kontaktuaren xehetasunak</string>
+  <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string>
+  <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
+  <string name="title_activity_choose_contact">Kontaktua hautatu</string>
+  <string name="title_activity_block_list">Blokeatutakoen zerrenda</string>
+  <string name="just_now">orain</string>
+  <string name="minute_ago">min 1 lehenago</string>
+  <string name="minutes_ago">%d min lehenago</string>
+  <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
+  <string name="sending">bidaltzen…</string>
+  <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron…</string>
+  <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
+  <string name="admin">Administratzailea</string>
+  <string name="owner">Jabea</string>
+  <string name="moderator">Moderatzailea</string>
+  <string name="participant">Parte-hartzailea</string>
+  <string name="visitor">Bisitaria</string>
+  <string name="remove_contact_text">%s zure zerrendatik ezabatu nahi duzu? Kontu honekin lotutako elkarrizketa ez da ezabatuko.</string>
+  <string name="block_contact_text">%s(e)k zuri mezuak bidaltzea blokeatu nahi al duzu?</string>
+  <string name="unblock_contact_text">%s desblokeatu eta zuri mezuak bidali ahal izatea onartu nahi al duzu?</string>
+  <string name="block_domain_text">%s(r)en kontaktu guztiak blokeatu?</string>
+  <string name="unblock_domain_text">%s(r)en kontaktu guztiak desblokeatu?</string>
+  <string name="contact_blocked">Kontaktua blokeatu da</string>
+  <string name="remove_bookmark_text">%s laster-marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string>
+  <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
+  <string name="change_password_on_server">Pasahitza zerbitzarian aldatu</string>
+  <string name="share_with">Partekatu honekin...</string>
+  <string name="start_conversation">Elkarrizketa hasi</string>
+  <string name="invite_contact">Kontaktu bat gonbidatu</string>
+  <string name="contacts">Kontaktuak</string>
+  <string name="cancel">Utzi</string>
+  <string name="set">Ezarri</string>
+  <string name="add">Gehitu</string>
+  <string name="edit">Editatu</string>
+  <string name="delete">Ezabatu</string>
+  <string name="block">Blokeatu</string>
+  <string name="unblock">Desblokeatu</string>
+  <string name="save">Gorde</string>
+  <string name="ok">Ados</string>
+  <string name="crash_report_title">Conversations gelditu da</string>
+  <string name="crash_report_message">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu\n<b>Abisua:</b> Honek zure XMPP kontua erabiliko du garatzaileari akats harraska bidaltzeko.</string>
+  <string name="send_now">Bidali orain</string>
+  <string name="send_never">Ez galdetu berriz</string>
+  <string name="problem_connecting_to_account">Ezin izan da kontura konektatu</string>
+  <string name="problem_connecting_to_accounts">Ezin izan da hainbat kontuetara konektatu</string>
+  <string name="touch_to_fix">Ukitu hemen zure kontuak kudeatzeko</string>
+  <string name="attach_file">Fitxategia erantsi</string>
+  <string name="not_in_roster">Kontaktua ez dago zure zerrendan. Gehitu nahiko al zenuke?</string>
+  <string name="add_contact">Kontaktua gehitu</string>
+  <string name="send_failed">huts bidaltzerakoan</string>
+  <string name="send_rejected">ukatua</string>
+  <string name="preparing_image">Irudia transmisiorako prestatzen. Mesedez itxaron…</string>
+  <string name="action_clear_history">Historia garbitu</string>
+  <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
+  <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
+  <string name="delete_messages">Mezuak ezabatu</string>
+  <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
+  <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
+  <string name="send_plain_text_message">Testu mezua bidali</string>
+  <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
+  <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
+  <string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
+  <string name="download_image">Irudia deskargatu</string>
+  <string name="send_unencrypted">Enkriptatu gabe bidali</string>
+  <string name="decryption_failed">Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversationsek <b>OpenKeychain</b> izeneko hirugarren app bat erabiltzen du mezuak enkriptatu eta desenkriptatzeko eta zure gako publikoak kudeatzeko.\n\nOpenKeychain GPLv3 lizentziapean dago eta F-Droid eta Google Playn eskura daiteke.\n\n<small>(Mesedez ondoren Conversations berrabiarazi)</small></string>
+  <string name="restart">Berrabiarazi</string>
+  <string name="install">Instalatu</string>
+  <string name="offering">eskeintzen…</string>
+  <string name="waiting">itxaroten…</string>
+  <string name="no_pgp_key">Ez da OpenPGP gakorik aurkitu</string>
+  <string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
+  <string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
+  <string name="contacts_have_no_pgp_keys">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktuak haien gako publikoa jakinarazten ez daudelako.\n\n<small>Mesedez eskatu ezaiezu zure kontakuei OpenPGP konfigura dezaten.</small></string>
+  <string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
+  <string name="pref_general">Orokorrak</string>
+  <string name="pref_xmpp_resource">XMPP baliabidea</string>
+  <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
+  <string name="pref_accept_files">Fitxategiak onartu</string>
+  <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string>
+  <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string>
+  <string name="pref_notifications">Jakinarazpenak</string>
+  <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
+  <string name="pref_vibrate">Dardaratu</string>
+  <string name="pref_vibrate_summary">Dardaratu ere mezu berri bat heltzerakoan</string>
+  <string name="pref_sound">Soinua</string>
+  <string name="pref_sound_summary">Dei-tonua jo jakinarazpenarekin</string>
+  <string name="pref_conference_notifications">Konferentzien jakinarazpenak</string>
+  <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string>
+  <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
+  <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
+  <string name="pref_advanced_options">Aukera aurreratuak</string>
+  <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
+  <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
+  <string name="pref_confirm_messages">Mezuak egiaztatu</string>
+  <string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string>
+  <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
+  <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
+  <string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
+  <string name="accept">Onartu</string>
+  <string name="error">Akats bat gertatu da</string>
+  <string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string>
+  <string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string>
+  <string name="subscriptions">Harpidetzak</string>
+  <string name="your_account">Zure kontua</string>
+  <string name="keys">Gakoak</string>
+  <string name="send_presence_updates">Presentzia eguneraketak bidali</string>
+  <string name="receive_presence_updates">Presentzia eguneraketak jaso</string>
+  <string name="ask_for_presence_updates">Presentzia eguneraketak eskatu</string>
+  <string name="attach_choose_picture">Argazkia aukeratu</string>
+  <string name="attach_take_picture">Argazkia egin</string>
+  <string name="preemptively_grant">Prebentiboki harpidetza eskaera eman</string>
+  <string name="error_not_an_image_file">Aukeratu duzun fitxategia ez da irudi bat</string>
+  <string name="error_compressing_image">Huts irudi fitxategia bihurtzerakoan</string>
+  <string name="error_file_not_found">Fitxategia ez da aurkitu</string>
+  <string name="error_io_exception">Sarrera/Irteera akats orokorra. Agian biltegian lekurik gabe gelditu zara?</string>
+  <string name="error_security_exception_during_image_copy">Irudi hau aukeratzeko erabili duzun aplikazioak ez digu fitxategia irakurtzeko baimen nahikorik eman.\n\n<small>Beste fitxategi kudeatzaile bat erabili ezazu irudia aukeratzeko</small></string>
+  <string name="account_status_unknown">Ezezaguna</string>
+  <string name="account_status_disabled">Aldi baterako ezgaituta</string>
+  <string name="account_status_online">Konektatuta</string>
+  <string name="account_status_connecting">Konektatzen\u2026</string>
+  <string name="account_status_offline">Lineaz kanpo</string>
+  <string name="account_status_unauthorized">Ez baimenduta</string>
+  <string name="account_status_not_found">Zerbitzaria ez da aurkitu</string>
+  <string name="account_status_no_internet">Konektagarritasunik ez</string>
+  <string name="account_status_regis_fail">Erregistroak huts egin du</string>
+  <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string>
+  <string name="account_status_regis_success">Erregistroa burutu da</string>
+  <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
+  <string name="account_status_security_error">Segurtasun akatsa</string>
+  <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
+  <string name="encryption_choice_none">Testu laua</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Kontua editatu</string>
+  <string name="mgmt_account_delete">Kontua ezabatu</string>
+  <string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
+  <string name="mgmt_account_publish_avatar">Profileko argazkia argitaratu</string>
+  <string name="mgmt_account_publish_pgp">OpenPGP gako publikoa argitaratu</string>
+  <string name="mgmt_account_enable">Kontua gaitu</string>
+  <string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
+  <string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu zure elkarrizketa historia guztia galduko da</string>
+  <string name="attach_record_voice">Ahotsa grabatu</string>
+  <string name="account_settings_jabber_id">Jabber IDa</string>
+  <string name="account_settings_password">Pasahitza</string>
+  <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
+  <string name="account_settings_confirm_password">Pasahitza egiaztatu</string>
+  <string name="password">Pasahitza</string>
+  <string name="confirm_password">Pasahitza egiaztatu</string>
+  <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
+  <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
+  <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
+  <string name="add_phone_book_text">%s zure telefono kontaktu zerrendara gehitu nahi al duzu?</string>
+  <string name="contact_status_online">konektatuta</string>
+  <string name="contact_status_free_to_chat">hitzegiteko aske</string>
+  <string name="contact_status_away">kanpoan</string>
+  <string name="contact_status_extended_away">luzerako kanpoan</string>
+  <string name="contact_status_do_not_disturb">ez gogaitu</string>
+  <string name="contact_status_offline">lineaz kanpo</string>
+  <string name="muc_details_conference">Konferentzia</string>
+  <string name="muc_details_other_members">Beste kideak</string>
+  <string name="server_info_show_more">Zerbitzariaren informazioa</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Profileko argazkiak)</string>
+  <string name="server_info_available">eskuragarri</string>
+  <string name="server_info_unavailable">ez eskuragarri</string>
+  <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string>
+  <string name="last_seen_now">azkenengoz ikusia orain</string>
+  <string name="last_seen_min">azkenengoz ikusia minutu 1 lehenago</string>
+  <string name="last_seen_mins">azkenengoz ikusia %d minutu lehenago</string>
+  <string name="last_seen_hour">azkenengoz ikusia ordu 1 lehenago</string>
+  <string name="last_seen_hours">azkenengoz ikusia %d ordu lehenago</string>
+  <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
+  <string name="last_seen_days">azkenengoz ikusia %d egun lehenago</string>
+  <string name="never_seen">inoiz ez ikusia</string>
+  <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string>
+  <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string>
+  <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string>
+  <string name="reception_failed">Jasotzeak huts egin du</string>
+  <string name="your_fingerprint">Zure hatz-marka</string>
+  <string name="otr_fingerprint">OTR hatz-marka</string>
+  <string name="verify">Egiaztatu</string>
+  <string name="decrypt">Desenkriptatu</string>
+  <string name="conferences">Konferentziak</string>
+  <string name="search">Bilatu</string>
+  <string name="create_contact">Kontaktua sortu</string>
+  <string name="join_conference">Konferentziara batu</string>
+  <string name="delete_contact">Kontaktua ezabatu</string>
+  <string name="view_contact_details">Kontaktuaren xehetasunak ikusi</string>
+  <string name="block_contact">Kontaktua blokeatu</string>
+  <string name="unblock_contact">Kontaktua desblokeatu</string>
+  <string name="create">Sortu</string>
+  <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string>
+  <string name="join">Batu</string>
+  <string name="conference_address">Konferentziaren helbidea</string>
+  <string name="conference_address_example">gela@conference.example.com</string>
+  <string name="save_as_bookmark">Gorde laster-marka bezala</string>
+  <string name="delete_bookmark">Laster-marka ezabatu</string>
+  <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
+  <string name="you">Zu</string>
+  <string name="action_edit_subject">Konferentziaren gaia editatu</string>
+  <string name="conference_not_found">Konferentzia ez da aurkitu</string>
+  <string name="leave">Alde egin</string>
+  <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
+  <string name="add_back">Bera gehitu</string>
+  <string name="contact_has_read_up_to_this_point">%s(e)k puntu honetaraino irakurri du</string>
+  <string name="publish">Argitaratu</string>
+  <string name="touch_to_choose_picture">Ukitu profileko argazkia irudi bat galeriatik hautatzeko</string>
+  <string name="publish_avatar_explanation">Adi: Zure presentzia eguneraketetara harpidetutako edonork irudi hau ikusi ahal izango du.</string>
+  <string name="publishing">Argitaratzen…</string>
+  <string name="error_publish_avatar_server_reject">Zerbitzariak zure argitarapena ukatu du</string>
+  <string name="error_publish_avatar_converting">Zerbait oker joan da zure irudia bihurtzerakoan</string>
+  <string name="error_saving_avatar">Ezin izan da profileko argazkia diskoan gorde</string>
+  <string name="or_long_press_for_default">(Edo sakatu luze lehenetsira bueltatzeko)</string>
+  <string name="error_publish_avatar_no_server_support">Zure zerbitzariak ez du profileko argazkien argitarapena onartzen</string>
+  <string name="private_message">xuxurlatu</string>
+  <string name="private_message_to">%s(r)i</string>
+  <string name="send_private_message_to">%s(r)i mezu pribatua bidali</string>
+  <string name="connect">Konektatu</string>
+  <string name="account_already_exists">Kontu hau existitzen da dagoeneko</string>
+  <string name="next">Hurrengoa</string>
+  <string name="server_info_session_established">Uneko saioa ezarri da</string>
+  <string name="additional_information">Informazio gehiago</string>
+  <string name="skip">Orain ez</string>
+  <string name="disable_notifications">Jakinarazpenak ezgaitu</string>
+  <string name="disable_notifications_for_this_conversation">Elkarrizketa honetarako jakinarazpenak ezgaitu</string>
+  <string name="notifications_disabled">Jakinarazpenak ezgaituta daude</string>
+  <string name="enable">Gaitu</string>
+  <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
+  <string name="enter_password">Sartu pasahitza</string>
+  <string name="missing_presence_updates">Kontaktuaren presentzia eguneraketak falta dira</string>
+  <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
+  <string name="request_now">Eskatu orain</string>
+  <string name="delete_fingerprint">Hatz-marka ezabatu</string>
+  <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
+  <string name="ignore">Kasurik ez egin</string>
+  <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
+  <string name="pref_encryption_settings">Enkriptazio ezarpenak</string>
+  <string name="pref_force_encryption">End-to-end enkriptazioa behartu</string>
+  <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
+  <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
+  <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
+  <string name="pref_expert_options">Adituentzako aukerak</string>
+  <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
+  <string name="title_activity_about">Conversationsi buruz</string>
+  <string name="pref_about_conversations_summary">Eraikitze eta lizentzia informazioa</string>
+  <string name="title_pref_quiet_hours">Ordu lasaiak</string>
+  <string name="title_pref_quiet_hours_start_time">Hasiera ordua</string>
+  <string name="title_pref_quiet_hours_end_time">Amaiera ordua</string>
+  <string name="title_pref_enable_quiet_hours">Ordu lasaiak gaitu</string>
+  <string name="pref_quiet_hours_summary">Jakinarazpenak isilaraziko dira ordu lasaiak iraun bitartean </string>
+  <string name="pref_use_larger_font">Letraren tamaina handitu</string>
+  <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
+  <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
+  <string name="pref_use_indicate_received">Mezuen jasotzea eskatu</string>
+  <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
+  <string name="pref_expert_options_other">Besteak</string>
+  <string name="pref_conference_name">Konferentziaren izena</string>
+  <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko eta ez JIDa</string>
+  <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
+  <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
+  <string name="conference_members_only">Konferentzia hau kideentzat da soilik</string>
+  <string name="conference_kicked">Konferentzia honetatik kanporatua izan zara</string>
+  <string name="using_account">%s kontua erabiltzen</string>
+  <string name="checking_image">Irudia egiaztatzen HTTP ostalarian</string>
+  <string name="image_file_deleted">Irudia ezabatu egin da</string>
+  <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string>
+  <string name="check_image_filesize">Irudiaren tamaina egiaztatu</string>
+  <string name="message_options">Mezuaren aukerak</string>
+  <string name="copy_text">Testua kopiatu</string>
+  <string name="copy_original_url">Jatorrizko URLa kopiatu</string>
+  <string name="send_again">Berriro bidali</string>
+  <string name="image_url">Irudiaren URLa</string>
+  <string name="message_text">Testu mezua</string>
+  <string name="url_copied_to_clipboard">URLa arbelera kopiatu da</string>
+  <string name="message_copied_to_clipboard">Mezua arbelera kopiatu da</string>
+  <string name="image_transmission_failed">Irudiaren transmisioak huts egin du</string>
+  <string name="scan_qr_code">QR kodea eskaneatu</string>
+  <string name="show_qr_code">QR kodea erakutsi</string>
+  <string name="show_block_list">Blokeatutakoen zerrenda ikusi</string>
+  <string name="account_details">Kontuaren xehetasunak</string>
+  <string name="verify_otr">OTR egiaztatu</string>
+  <string name="remote_fingerprint">Urruneko hatz-marka</string>
+  <string name="scan">eskaneatu</string>
+  <string name="or_touch_phones">(edo telefonoak ikutu)</string>
+  <string name="smp">Socialist Millionaire protokoloa</string>
+  <string name="shared_secret_hint">Iradokizuna edo galdera</string>
+  <string name="shared_secret_secret">Partekatutako sekretua</string>
+  <string name="confirm">Baieztatu</string>
+  <string name="in_progress">Lanean</string>
+  <string name="respond">Erantzun</string>
+  <string name="failed">Huts egin du</string>
+  <string name="secrets_do_not_match">Sekretuak ez dute bat egiten</string>
+  <string name="try_again">Saiatu berriz</string>
+  <string name="finish">Amaitu</string>
+  <string name="verified">Egiaztatuta!</string>
+  <string name="smp_requested">Kontaktuak SMP egiaztapena eskatu du</string>
+  <string name="no_otr_session_found">Ez da OTR saio baliodunik aurkitu!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Zerbitzua atzeko planoan mantendu</string>
+  <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
+  <string name="choose_file">Fitxategia aukeratu</string>
+  <string name="receiving_x_file">%1$s jasotzen (%2$d%% osatua)</string>
+  <string name="download_x_file">%s deskargatu</string>
+  <string name="file">fitxategia</string>
+  <string name="open_x_file">%s ireki</string>
+  <string name="sending_file">bidaltzen (%1$d%% osatua)</string>
+  <string name="preparing_file">Fitxategia transmisiorako prestatzen</string>
+  <string name="x_file_offered_for_download">%s deskargatzeko eskeinita</string>
+  <string name="cancel_transmission">Transmisioa utzi</string>
+  <string name="file_transmission_failed">fitxategi transmisioak huts egin du</string>
+  <string name="file_deleted">Fitxategia ezabatu egin da</string>
+  <string name="no_application_found_to_open_file">Fitxategia ireki dezakeen aplikaziorik ez da aurkitu</string>
+  <string name="could_not_verify_fingerprint">Hatz-marka ezin izan da egiaztatu</string>
+  <string name="manually_verify">Eskuz egiaztatu</string>
+  <string name="are_you_sure_verify_fingerprint">Ziur al zaude zure kontaktuaren OTR hatz-marka egiaztatu nahi duzulaz?</string>
+  <string name="pref_show_dynamic_tags">Etiketa dinamikoak erakutsi</string>
+  <string name="pref_show_dynamic_tags_summary">Irakurtzeko soilik diren etiketak erakutsi kontaktuen azpian</string>
+  <string name="enable_notifications">Jakinarazpenak gaitu</string>
+  <string name="conference_with">Konferentzia sortu honekin…</string>
+  <string name="no_conference_server_found">Ez da konferentzia zerbitzaririk aurkitu</string>
+  <string name="conference_creation_failed">Konferentzia sortzeak huts egin du!</string>
+  <string name="conference_created">Konferentzia sortu da!</string>
+  <string name="secret_accepted">Sekretua onartu da!</string>
+  <string name="reset">Berrezarri</string>
+  <string name="account_image_description">Kontuaren profileko argazkia</string>
+  <string name="copy_otr_clipboard_description">OTR hatz-marka arbelera kopiatu</string>
+  <string name="fetching_history_from_server">Mezuak zerbitzaritik eskuratzen</string>
+  <string name="no_more_history_on_server">Mezu gehiagorik ez zerbitzarian</string>
+  <string name="updating">Eguneratzen...</string>
+  <string name="password_changed">Pasahitza aldatu da</string>
+  <string name="could_not_change_password">Pasahitza ezin izan da aldatu</string>
+  <string name="otr_session_not_started">Mezu bat bidali enkripatutako elkarrizketa hasteko</string>
+  <string name="ask_question">Galdetu</string>
+  <string name="smp_explain_question">Zu eta zure kontaktua beste inor ezagutzen ez duen elkarren arteko sekreturen bat baduzue (ohiko txantxa edo azkenengo aldian bazkaldu zenutena adibidez) bakoitzaren hatz-markak egiaztatzeko sekretu hori erabili dezakezue.\n\nIradokizun edo galdera bat eman behar duzu zure kontaktuak erantzun dezan, letra larri eta xeheak bereiziz.</string>
+  <string name="smp_explain_answer">Zure kontaktuak zure hatz-marka egiaztatu nahi du partekatutako sekretu batekin erronka eginez. Zure kontaktuak hurrengo iradokizuna edo sekretu horren galdera eman du.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Zure iradokizuna ez luke hutsik egon behar</string>
+  <string name="shared_secret_can_not_be_empty">Zure partekatutako sekretua ezin da hutsik egon</string>
+  <string name="manual_verification_explanation">Kontu handiz konpara ezazu beheko hatz-marka zure kontaktuaren hatz-markarekin.\nEnkriptatutako email bat edota telefono dei bat bezalako edozein komunikabide fidagarriren bat erabili dezakezu horiek trukatzeko.</string>
+  <string name="change_password">Pasahitza aldatu</string>
+  <string name="current_password">Oraingo pasahitza</string>
+  <string name="new_password">Pasahitza berria</string>
+  <string name="password_should_not_be_empty">Pasahitza ez luke hutsik egon behar</string>
+  <string name="enable_all_accounts">Kontu guztiak gaitu</string>
+  <string name="disable_all_accounts">Kontu guztiak ezgaitu</string>
+  <string name="perform_action_with">Ekintza honekin egin</string>
+  <string name="no_affiliation">Afiliaziorik ez</string>
+  <string name="no_role">Rolik ez</string>
+  <string name="outcast">Baztertutakoa</string>
+  <string name="member">Kidea</string>
+  <string name="advanced_mode">Modu aurreratua</string>
+  <string name="grant_membership">Bazkidetza eman</string>
+  <string name="remove_membership">Bazkidetza ezezaztu</string>
+  <string name="grant_admin_privileges">Administratzaile baimenak eman</string>
+  <string name="remove_admin_privileges">Administratzaile baimenak ezeztatu</string>
+  <string name="remove_from_room">Konferentziatik kendu</string>
+  <string name="could_not_change_affiliation">%s(r)en afiliazioa ezin izan da aldatu</string>
+  <string name="ban_from_conference">Konferentzian egotea debekatu</string>
+  <string name="removing_from_public_conference">%s konferentzia publiko batetik ateratzen saiatzen ari zara. Hori lortzeko modu bakarra erabiltzaile hori betiko debekatzea da.</string>
+  <string name="ban_now">Debekatu orain</string>
+  <string name="could_not_change_role">%s(r)en rola ezin izan da aldatu</string>
+  <string name="public_conference">Publikoki edonor sar daiteken konferentzia</string>
+  <string name="private_conference">Konferentzia pribatua, kideentzat soilik</string>
+  <string name="conference_options">Konferentziaren aukerak</string>
+  <string name="members_only">Pribatua (kideak soilik)</string>
+  <string name="non_anonymous">Ez anonimoa</string>
+  <string name="modified_conference_options">Konferentziaren aukerak aldatu dira</string>
+  <string name="could_not_modify_conference_options">Konferentziaren aukerak ezin izan dira aldatu</string>
+  <string name="never">Inoiz</string>
+  <string name="thirty_minutes">30 minutu</string>
+  <string name="one_hour">ordu 1</string>
+  <string name="two_hours">2 ordu</string>
+  <string name="eight_hours">8 ordu</string>
+  <string name="until_further_notice">abisatu arte</string>
+  <string name="pref_input_options">Sarrera aukerak</string>
+  <string name="pref_enter_is_send">Sartu teklak bidaltzen du</string>
+  <string name="pref_enter_is_send_summary">Sartu tekla erabili mezua bidaltzeko</string>
+  <string name="pref_display_enter_key">Sartu tekla erakutsi</string>
+  <string name="pref_display_enter_key_summary">Aurpegieren tekla sartu teklarekin aldatu</string>
+  <string name="audio">audioa</string>
+  <string name="video">bideoa</string>
+  <string name="image">irudia</string>
+  <string name="pdf_document">PDF dokumentua</string>
+  <string name="apk">Android aplikazioa</string>
+  <string name="vcard">Kontaktua</string>
+  <string name="received_x_file">%s jaso da</string>
+  <string name="disable_foreground_service">Atzeko planoko zerbiztua ezgaitu</string>
+  <string name="touch_to_open_conversations">Ikutu Conversations irekitzeko</string>
+  <string name="avatar_has_been_published">Profileko argazkia argitaratu da</string>
+  <string name="sending_x_file">%s bidaltzen</string>
+  <string name="offering_x_file">%s eskeintzen...</string>
 </resources>
diff --git a/src/main/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml
deleted file mode 100644
index ae140796..00000000
--- a/src/main/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mobile</item>
-        <item>Téléphone</item>
-        <item>Tablette</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>jamais</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index b3b86f1f..ba2fbcf7 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -1,272 +1,409 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Paramètres</string>
-    <string name="action_add">Nouvelle conversation</string>
-    <string name="action_accounts">Gérer les comptes</string>
-    <string name="action_end_conversation">Terminer cette conversation</string>
-    <string name="action_contact_details">Détails du contact</string>
-    <string name="action_muc_details">Détails de la conférence</string>
-    <string name="action_secure">Conversation sécurisée</string>
-    <string name="action_add_account">Ajouter un compte</string>
-    <string name="action_edit_contact">Modifier le nom</string>
-    <string name="action_add_phone_book">Ajouter aux contacts</string>
-    <string name="action_delete_contact">Retirer des contacts</string>
-    <string name="title_activity_manage_accounts">Gestion des comptes</string>
-    <string name="title_activity_settings">Paramètres</string>
-    <string name="title_activity_conference_details">Détails de la conférence</string>
-    <string name="title_activity_contact_details">Détails du contact</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Partager avec Conversation</string>
-    <string name="title_activity_start_conversation">Lancement de Conversation</string>
-    <string name="title_activity_choose_contact">Choix du contact</string>
-    <string name="just_now">À l\'instant</string>
-    <string name="minute_ago">Il y a 1 minute</string>
-    <string name="minutes_ago">Il y a %d minutes</string>
-    <string name="unread_conversations">Conversations non lues</string>
-    <string name="sending">envoi&#8230;</string>
-    <string name="encrypted_message">Déchiffrement du message. Patientez&#8230;</string>
-    <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
-    <string name="admin">Administrateur</string>
-    <string name="owner">Propriétaire</string>
-    <string name="moderator">Modérateur</string>
-    <string name="participant">Participant</string>
-    <string name="visitor">Visiteur</string>
-    <string name="remove_contact_text">Voulez-vous supprimer %s de votre liste? Les conversations associées à ce compte ne seront pas supprimées.</string>
-    <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée avec ce favoris ne sera pas supprimé.</string>
-    <string name="register_account">Créer un nouveau compte sur le serveur</string>
-    <string name="share_with">Partager avec</string>
-    <string name="start_conversation">Démarrer une conversation</string>
-    <string name="invite_contact">Inviter des contacts</string>
-    <string name="contacts">Contacts</string>
-    <string name="cancel">Annuler</string>
-    <string name="add">Ajouter</string>
-    <string name="edit">Modifier</string>
-    <string name="delete">Supprimer</string>
-    <string name="save">Enregistrer</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Conversations s\'est arreté</string>
-    <string name="crash_report_message">En envoyant des logs vous aidez au développement de Conversations.\n\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
-    <string name="send_now">Envoyer</string>
-    <string name="send_never">Ne plus me demander</string>
-    <string name="problem_connecting_to_account">Impossible de se connecter au compte.</string>
-    <string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes.</string>
-    <string name="touch_to_fix">Appuyez pour gérer vos comptes.</string>
-    <string name="attach_file">Lier un fichier</string>
-    <string name="not_in_roster">Le contact n\'est pas dans votre carnet d\'adresses. Voulez-vous l\'y ajouter?</string>
-    <string name="add_contact">Ajouter un contact</string>
-    <string name="send_failed">Echec de l\'envoi.</string>
-    <string name="send_rejected">Rejeté</string>
-    <string name="receiving_image">Réception d\'une image. Patientez&#8230;</string>
-    <string name="preparing_image">Préparation de la transmission de l\'image. Patientez&#8230;</string>
-    <string name="action_clear_history">Vider l\'historique</string>
-    <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
-    <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation?\n\n<b>Attention:</b> Les messages seront supprimés uniquement sur ce périphérique.</string>
-    <string name="delete_messages">Supprimer les messages</string>
-    <string name="also_end_conversation">Terminer plus tard cette conversation</string>
-    <string name="choose_presence">Choisir le status de présence</string>
-    <string name="send_plain_text_message">Envoyer un message</string>
-    <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
-    <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
-    <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
-    <string name="download_image">Télécharger l\'image</string>
-    <string name="image_offered_for_download"><i>Image proposée au téléchargement.</i></string>
-    <string name="send_unencrypted">Envoyer en clair</string>
-    <string name="decryption_failed">Echec du déchiffrement. Merci de vérifier la clef privée utilisée.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Merci de redémarrer Conversations apres l\'installation du logiciel)</small></string>
-    <string name="restart">Redémarrer</string>
-    <string name="install">Installer</string>
-    <string name="offering">Proposition&#8230;</string>
-    <string name="waiting">Patientez&#8230;</string>
-    <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
-    <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer OpenPGP.</small></string>
-    <string name="no_pgp_keys">Aucune clef OpenPGP n\'est disponible.</string>
-    <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vous ne connaissez pas la clef publique de vos contacts.\n\n<small>Merci de les faire configurer leur OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
-    <string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
-    <string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
-    <string name="pref_general">Général</string>
-    <string name="pref_xmpp_resource">Ressource XMPP</string>
-    <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
-    <string name="pref_accept_files">Accepter les fichiers</string>
-    <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que&#8230;</string>
-    <string name="pref_notification_settings">Paramètres de notification</string>
-    <string name="pref_notifications">Notifications</string>
-    <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
-    <string name="pref_vibrate">Vibration</string>
-    <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message</string>
-    <string name="pref_sound">Sonore</string>
-    <string name="pref_sound_summary">Jouer une sonnerie lors de l\'arrivée d\'un message</string>
-    <string name="pref_conference_notifications">Notifications lors des conférences</string>
-    <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string>
-    <string name="pref_notification_grace_period">Période sans notification</string>
-    <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
-    <string name="pref_advanced_options">Options avancées</string>
-    <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
-    <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
-    <string name="pref_confirm_messages">Confirmation de lecture</string>
-    <string name="pref_confirm_messages_summary">Informer l\'expéditeur d\'un message de sa bonne réception.</string>
-    <string name="pref_ui_options">Options d\'affichage</string>
-    <string name="openpgp_error">Une erreur s\'est produite via OpenKeychain</string>
-    <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
-    <string name="accept">Accepter</string>
-    <string name="error">Une erreur s\'est produite</string>
-    <string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string>
-    <string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string>
-    <string name="subscriptions">Publications</string>
-    <string name="your_account">Votre compte</string>
-    <string name="keys">Clefs</string>
-    <string name="send_presence_updates">Envoyer les mises à jour de présence</string>
-    <string name="receive_presence_updates">Recevoir les mises à jour de présence</string>
-    <string name="ask_for_presence_updates">Demander les mises à jour de présence</string>
-    <string name="attach_choose_picture">Choisir une image</string>
-    <string name="attach_take_picture">Prendre une photo</string>
-    <string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
-    <string name="error_not_an_image_file">Le fichier choisi n\'est pas une image</string>
-    <string name="error_compressing_image">Une erreur s\'est produite en convertissant l\'image</string>
-    <string name="error_file_not_found">Fichier non trouvé</string>
-    <string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l\'espace libre?</string>
-    <string name="error_security_exception_during_image_copy">L\'application utilisée empêche la lecture de l\'image.\n\n<small>Choisissez l\'image depuis une autre application.</small></string>
-    <string name="account_status_unknown">Inconnu</string>
-    <string name="account_status_disabled">Désactivé temporairement</string>
-    <string name="account_status_online">En ligne</string>
-    <string name="account_status_connecting">Connexion\u2026</string>
-    <string name="account_status_offline">Hors-ligne</string>
-    <string name="account_status_unauthorized">Non autorisé</string>
-    <string name="account_status_not_found">Serveur non trouvé</string>
-    <string name="account_status_no_internet">Aucune connectivité</string>
-    <string name="account_status_regis_fail">Enregistrement échoué</string>
-    <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
-    <string name="account_status_regis_success">Enregistrement réussi</string>
-    <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
-    <string name="encryption_choice_none">Texte clair</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Modifier le compte</string>
-    <string name="mgmt_account_delete">Supprimer</string>
-    <string name="mgmt_account_disable">Désactiver temporairement</string>
-    <string name="mgmt_account_publish_avatar">Publier un avatar</string>
-    <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
-    <string name="mgmt_account_enable">Activer</string>
-    <string name="mgmt_account_are_you_sure">Êtes-vous sûr?</string>
-    <string name="mgmt_account_delete_confirm_text">En supprimant votre compte, votre historique de conversations sera perdu!</string>
-    <string name="attach_record_voice">Enregistrer un son</string>
-    <string name="account_settings_jabber_id">Identifiant</string>
-    <string name="account_settings_password">Mot de passe</string>
-    <string name="account_settings_example_jabber_id">utilisateur@exemple.com</string>
-    <string name="account_settings_confirm_password">Confirmer le mot de passe</string>
-    <string name="password">Mot de passe</string>
-    <string name="confirm_password">Confirmer le mot de passe</string>
-    <string name="passwords_do_not_match">Les deux mots de passes ne correspondent pas.</string>
-    <string name="invalid_jid">Ce n\'est pas un identifiant valide.</string>
-    <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
-    <string name="add_phone_book_text">Voulez-vous ajouter %s aux contacts du téléphone?</string>
-    <string name="contact_status_online">En ligne</string>
-    <string name="contact_status_free_to_chat">Disponible</string>
-    <string name="contact_status_away">Absent</string>
-    <string name="contact_status_extended_away">Absent depuis longtemps</string>
-    <string name="contact_status_do_not_disturb">Ne pas déranger</string>
-    <string name="contact_status_offline">Hors-ligne</string>
-    <string name="muc_details_conference">Conférence</string>
-    <string name="muc_details_other_members">Autres membres</string>
-    <string name="server_info_carbon_messages">Copies carbone</string>
-    <string name="server_info_stream_management">Gestion des flux</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">disponible</string>
-    <string name="server_info_unavailable">indisponible</string>
-    <string name="missing_public_keys">Aucune annonce de clef publique</string>
-    <string name="last_seen_now">en ligne à l\'instant</string>
-    <string name="last_seen_min">en ligne il y a 1 minute</string>
-    <string name="last_seen_mins">en ligne il y a %d minutes</string>
-    <string name="last_seen_hour">en ligne il y a 1 heure</string>
-    <string name="last_seen_hours">en ligne il y a %d heures</string>
-    <string name="last_seen_day">en ligne hier</string>
-    <string name="last_seen_days">en ligne il y a %d jours</string>
-    <string name="never_seen">jamais vu en ligne</string>
-    <string name="install_openkeychain">Message chiffré. Merci d\'installer OpenKeychain pour lire le contenu du message.</string>
-    <string name="unknown_otr_fingerprint">Empreinte OTR inconnue.</string>
-    <string name="openpgp_messages_found">Messages chiffrés par OpenPGP détectés.</string>
-    <string name="reception_failed">Echec lors de la réception</string>
-    <string name="your_fingerprint">Votre empreinte</string>
-    <string name="otr_fingerprint">Empreinte OTR</string>
-    <string name="verify">Vérifier</string>
-    <string name="decrypt">Déchiffrer</string>
-    <string name="conferences">Conférences</string>
-    <string name="search">Rechercher</string>
-    <string name="create_contact">Ajouter un contact</string>
-    <string name="join_conference">Rejoindre la conférence</string>
-    <string name="delete_contact">Supprimer le contact</string>
-    <string name="view_contact_details">Afficher les détails du contact</string>
-    <string name="create">Ajouter</string>
-    <string name="contact_already_exists">Le contact existe déjà.</string>
-    <string name="join">Rejoindre</string>
-    <string name="conference_address">Adresse de la conférence</string>
-    <string name="conference_address_example">salle@conference.exemple.com</string>
-    <string name="save_as_bookmark">Enregistrer en favoris</string>
-    <string name="delete_bookmark">Supprimer le favoris</string>
-    <string name="bookmark_already_exists">Ce favoris existe déjà.</string>
-    <string name="you">Vous</string>
-    <string name="action_edit_subject">Modifier le sujet de la conférence</string>
-    <string name="conference_not_found">Conférence non trouvée</string>
-    <string name="leave">Partir</string>
-    <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
-    <string name="add_back">Ajouter également</string>
-    <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
-    <string name="publish">Publier</string>
-    <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
-    <string name="publish_avatar_explanation">Nota Bene: Les personnes ayant activé les mises jour de présence verront cette image.</string>
-    <string name="publishing">Mise à jour&#8230;</string>
-    <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre envoi d\'image</string>
-    <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
-    <string name="error_saving_avatar">Impossible de stocker l\'image sur le disque</string>
-    <string name="or_long_press_for_default">(Un appui long réinitialise le paramètre par defaut)</string>
-    <string name="error_publish_avatar_no_server_support">Votre serveur n\'autorise pas l\'envoi d\'avatars</string>
-    <string name="private_message">chuchoté</string>
-    <string name="private_message_to">pour %s</string>
-    <string name="send_private_message_to">Envoyer un message privé à %s</string>
-    <string name="connect">Se connecter</string>
-    <string name="account_already_exists">Ce compte existe déjà</string>
-    <string name="next">suivant</string>
-    <string name="server_info_session_established">Session établie</string>
-    <string name="additional_information">Informations supplémentaires</string>
-    <string name="skip">Passer</string>
-	<string name="disable_notifications">Désactiver les notifications</string>
-    <string name="disable_notifications_for_this_conversation">Désactiver les notifications pour cette conversation</string>
-    <string name="notifications_disabled">Notifications are Désactivées</string>
-    <string name="enable">Activer</string>
-    <string name="conference_requires_password">La conférence necessite un mot de passe</string>
-    <string name="enter_password">Entrer le mot de passe</string>
-    <string name="missing_presence_updates">Mise à jour de présence non connue</string>
-    <string name="request_presence_updates">Merci de demander à votre contact de fournir les mises à jour de présence.\n\n<small>Cela permettra de savoir quel matériel utilise votre contact.</small></string>
-    <string name="request_now">Demander maintenant</string>
-    <string name="delete_fingerprint">Supprimer l\'empreinte</string>
-    <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte?</string>
-    <string name="ignore">Ignorer</string>
-    <string name="without_mutual_presence_updates"><b>Attention:</b> Ceci peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
-    <string name="pref_encryption_settings">Paramètres de chiffrement</string>
-    <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
-    <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
-    <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
-    <string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
-    <string name="pref_expert_options">Options avancées</string>
-    <string name="pref_expert_options_summary">A utiliser avec précautions</string>
-    <string name="pref_use_larger_font">Augmenter la taille du texte</string>
-    <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
-    <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
-    <string name="pref_use_indicate_received">Accusé de reception</string>
-    <string name="pref_use_indicate_received_summary">Les messages recus seront marqués d\'une coche verte si disponible</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Adapter la couleur du bouton Envoyer pour indiquer le statut</string>
-    <string name="pref_expert_options_other">Autres</string>
-    <string name="pref_conference_name">Nom de la conférence </string>
-    <string name="pref_conference_name_summary">Identifier la conférence par son nom plutot que par son JID</string>
-    <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier!</string>
-    <string name="conference_banned">Vous êtes interdit de cette conférence</string>
-    <string name="conference_members_only">Cette conférence est réservée aux membres</string>
-    <string name="conference_kicked">Vous avez été éjecté de cette conférence</string>
-    <string name="using_account">utiliser le compte %s</string>
-    <string name="checking_image">Vérification de l\'image</string>
-    <string name="image_file_deleted">L\'image a été suprimée</string>
-    <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
-
+  <string name="action_settings">Paramètres</string>
+  <string name="action_add">Nouvelle conversation</string>
+  <string name="action_accounts">Gérer les comptes</string>
+  <string name="action_end_conversation">Terminer cette conversation</string>
+  <string name="action_contact_details">Détails du contact</string>
+  <string name="action_muc_details">Détails de la conférence</string>
+  <string name="action_secure">Conversation sécurisée</string>
+  <string name="action_add_account">Ajouter un compte</string>
+  <string name="action_edit_contact">Modifier le nom</string>
+  <string name="action_add_phone_book">Ajouter aux contacts</string>
+  <string name="action_delete_contact">Retirer des contacts</string>
+  <string name="action_block_contact">Bloquer le contact</string>
+  <string name="action_unblock_contact">Débloquer le contact</string>
+  <string name="action_block_domain">Bloquer le domaine</string>
+  <string name="action_unblock_domain">Débloquer le domaine</string>
+  <string name="title_activity_manage_accounts">Gestion des comptes</string>
+  <string name="title_activity_settings">Paramètres</string>
+  <string name="title_activity_conference_details">Détails de la conférence</string>
+  <string name="title_activity_contact_details">Détails du contact</string>
+  <string name="title_activity_sharewith">Partager avec Conversation</string>
+  <string name="title_activity_start_conversation">Lancement de Conversation</string>
+  <string name="title_activity_choose_contact">Choix du contact</string>
+  <string name="title_activity_block_list">Bloquer la liste</string>
+  <string name="just_now">À l\'instant</string>
+  <string name="minute_ago">Il y a 1 minute</string>
+  <string name="minutes_ago">Il y a %d minutes</string>
+  <string name="unread_conversations">Conversations non lues</string>
+  <string name="sending">envoi…</string>
+  <string name="encrypted_message">Déchiffrement du message. Patientez…</string>
+  <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
+  <string name="admin">Administrateur</string>
+  <string name="owner">Propriétaire</string>
+  <string name="moderator">Modérateur</string>
+  <string name="participant">Participant</string>
+  <string name="visitor">Visiteur</string>
+  <string name="remove_contact_text">Voulez-vous supprimer %s de votre liste? Les conversations associées à ce compte ne seront pas supprimées.</string>
+  <string name="block_contact_text">Voulez-vous bloquer %s de vous envoyer des messages?</string>
+  <string name="unblock_contact_text">Voulez-vous débloquer %s et leur permettre de vous envoyer des messages?</string>
+  <string name="block_domain_text">Bloquer tous les contacts de %s?</string>
+  <string name="unblock_domain_text">Débloquer tous les contacts de %s?</string>
+  <string name="contact_blocked">Contact bloqué</string>
+  <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée avec ce favoris ne sera pas supprimé.</string>
+  <string name="register_account">Créer un nouveau compte sur le serveur</string>
+  <string name="change_password_on_server">Changer de mot de passe sur le serveur</string>
+  <string name="share_with">Partager avec…</string>
+  <string name="start_conversation">Démarrer une conversation</string>
+  <string name="invite_contact">Inviter des contacts</string>
+  <string name="contacts">Contacts</string>
+  <string name="cancel">Annuler</string>
+  <string name="set">Établir</string>
+  <string name="add">Ajouter</string>
+  <string name="edit">Modifier</string>
+  <string name="delete">Supprimer</string>
+  <string name="block">Bloquer</string>
+  <string name="unblock">Débloquer</string>
+  <string name="save">Enregistrer</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Conversations s\'est arreté</string>
+  <string name="crash_report_message">En envoyant des logs vous aidez au développement de Conversations.\n\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
+  <string name="send_now">Envoyer</string>
+  <string name="send_never">Ne plus me demander</string>
+  <string name="problem_connecting_to_account">Impossible de se connecter au compte.</string>
+  <string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes.</string>
+  <string name="touch_to_fix">Appuyez pour gérer vos comptes.</string>
+  <string name="attach_file">Lier un fichier</string>
+  <string name="not_in_roster">Le contact n\'est pas dans votre carnet d\'adresses. Voulez-vous l\'y ajouter?</string>
+  <string name="add_contact">Ajouter un contact</string>
+  <string name="send_failed">Echec de l\'envoi.</string>
+  <string name="send_rejected">Rejeté</string>
+  <string name="preparing_image">Préparation de la transmission de l\'image. Patientez…</string>
+  <string name="action_clear_history">Vider l\'historique</string>
+  <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
+  <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation?\n\n<b>Attention:</b> Les messages seront supprimés uniquement sur ce périphérique.</string>
+  <string name="delete_messages">Supprimer les messages</string>
+  <string name="also_end_conversation">Terminer plus tard cette conversation</string>
+  <string name="choose_presence">Choisir le status de présence</string>
+  <string name="send_plain_text_message">Envoyer un message</string>
+  <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
+  <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
+  <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
+  <string name="download_image">Télécharger l\'image</string>
+  <string name="send_unencrypted">Envoyer en clair</string>
+  <string name="decryption_failed">Echec du déchiffrement. Merci de vérifier la clef privée utilisée.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Merci de redémarrer Conversations apres l\'installation du logiciel)</small></string>
+  <string name="restart">Redémarrer</string>
+  <string name="install">Installer</string>
+  <string name="offering">Proposition…</string>
+  <string name="waiting">Patientez…</string>
+  <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
+  <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer OpenPGP.</small></string>
+  <string name="no_pgp_keys">Aucune clef OpenPGP n\'est disponible.</string>
+  <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vous ne connaissez pas la clef publique de vos contacts.\n\n<small>Merci de les faire configurer leur OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
+  <string name="pref_general">Général</string>
+  <string name="pref_xmpp_resource">Ressource XMPP</string>
+  <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
+  <string name="pref_accept_files">Accepter les fichiers</string>
+  <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string>
+  <string name="pref_notification_settings">Paramètres de notification</string>
+  <string name="pref_notifications">Notifications</string>
+  <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
+  <string name="pref_vibrate">Vibration</string>
+  <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message</string>
+  <string name="pref_sound">Sonore</string>
+  <string name="pref_sound_summary">Jouer une sonnerie lors de l\'arrivée d\'un message</string>
+  <string name="pref_conference_notifications">Notifications lors des conférences</string>
+  <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string>
+  <string name="pref_notification_grace_period">Période sans notification</string>
+  <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
+  <string name="pref_advanced_options">Options avancées</string>
+  <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
+  <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
+  <string name="pref_confirm_messages">Confirmation de lecture</string>
+  <string name="pref_confirm_messages_summary">Informer l\'expéditeur d\'un message de sa bonne réception.</string>
+  <string name="pref_ui_options">Options d\'affichage</string>
+  <string name="openpgp_error">Une erreur s\'est produite via OpenKeychain</string>
+  <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
+  <string name="accept">Accepter</string>
+  <string name="error">Une erreur s\'est produite</string>
+  <string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string>
+  <string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string>
+  <string name="subscriptions">Publications</string>
+  <string name="your_account">Votre compte</string>
+  <string name="keys">Clefs</string>
+  <string name="send_presence_updates">Envoyer les mises à jour de présence</string>
+  <string name="receive_presence_updates">Recevoir les mises à jour de présence</string>
+  <string name="ask_for_presence_updates">Demander les mises à jour de présence</string>
+  <string name="attach_choose_picture">Choisir une image</string>
+  <string name="attach_take_picture">Prendre une photo</string>
+  <string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
+  <string name="error_not_an_image_file">Le fichier choisi n\'est pas une image</string>
+  <string name="error_compressing_image">Une erreur s\'est produite en convertissant l\'image</string>
+  <string name="error_file_not_found">Fichier non trouvé</string>
+  <string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l\'espace libre?</string>
+  <string name="error_security_exception_during_image_copy">L\'application utilisée empêche la lecture de l\'image.\n\n<small>Choisissez l\'image depuis une autre application.</small></string>
+  <string name="account_status_unknown">Inconnu</string>
+  <string name="account_status_disabled">Désactivé temporairement</string>
+  <string name="account_status_online">En ligne</string>
+  <string name="account_status_connecting">Connexion\u2026</string>
+  <string name="account_status_offline">Hors-ligne</string>
+  <string name="account_status_unauthorized">Non autorisé</string>
+  <string name="account_status_not_found">Serveur non trouvé</string>
+  <string name="account_status_no_internet">Aucune connectivité</string>
+  <string name="account_status_regis_fail">Enregistrement échoué</string>
+  <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
+  <string name="account_status_regis_success">Enregistrement réussi</string>
+  <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
+  <string name="account_status_security_error">Erreur de sécurité</string>
+  <string name="account_status_incompatible_server">Serveur incompatible</string>
+  <string name="encryption_choice_none">Texte clair</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Modifier le compte</string>
+  <string name="mgmt_account_delete">Supprimer</string>
+  <string name="mgmt_account_disable">Désactiver temporairement</string>
+  <string name="mgmt_account_publish_avatar">Publier un avatar</string>
+  <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
+  <string name="mgmt_account_enable">Activer</string>
+  <string name="mgmt_account_are_you_sure">Êtes-vous sûr?</string>
+  <string name="mgmt_account_delete_confirm_text">En supprimant votre compte, votre historique de conversations sera perdu!</string>
+  <string name="attach_record_voice">Enregistrer un son</string>
+  <string name="account_settings_jabber_id">Identifiant</string>
+  <string name="account_settings_password">Mot de passe</string>
+  <string name="account_settings_example_jabber_id">utilisateur@exemple.com</string>
+  <string name="account_settings_confirm_password">Confirmer le mot de passe</string>
+  <string name="password">Mot de passe</string>
+  <string name="confirm_password">Confirmer le mot de passe</string>
+  <string name="passwords_do_not_match">Les deux mots de passes ne correspondent pas.</string>
+  <string name="invalid_jid">Ce n\'est pas un identifiant valide.</string>
+  <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
+  <string name="add_phone_book_text">Voulez-vous ajouter %s aux contacts du téléphone?</string>
+  <string name="contact_status_online">En ligne</string>
+  <string name="contact_status_free_to_chat">Disponible</string>
+  <string name="contact_status_away">Absent</string>
+  <string name="contact_status_extended_away">Absent depuis longtemps</string>
+  <string name="contact_status_do_not_disturb">Ne pas déranger</string>
+  <string name="contact_status_offline">Hors-ligne</string>
+  <string name="muc_details_conference">Conférence</string>
+  <string name="muc_details_other_members">Autres membres</string>
+  <string name="server_info_show_more">Infos sur le serveur</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">Copies carbone</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">Gestion des flux</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">disponible</string>
+  <string name="server_info_unavailable">indisponible</string>
+  <string name="missing_public_keys">Aucune annonce de clef publique</string>
+  <string name="last_seen_now">en ligne à l\'instant</string>
+  <string name="last_seen_min">en ligne il y a 1 minute</string>
+  <string name="last_seen_mins">en ligne il y a %d minutes</string>
+  <string name="last_seen_hour">en ligne il y a 1 heure</string>
+  <string name="last_seen_hours">en ligne il y a %d heures</string>
+  <string name="last_seen_day">en ligne hier</string>
+  <string name="last_seen_days">en ligne il y a %d jours</string>
+  <string name="never_seen">jamais vu en ligne</string>
+  <string name="install_openkeychain">Message chiffré. Merci d\'installer OpenKeychain pour lire le contenu du message.</string>
+  <string name="unknown_otr_fingerprint">Empreinte OTR inconnue.</string>
+  <string name="openpgp_messages_found">Messages chiffrés par OpenPGP détectés.</string>
+  <string name="reception_failed">Echec lors de la réception</string>
+  <string name="your_fingerprint">Votre empreinte</string>
+  <string name="otr_fingerprint">Empreinte OTR</string>
+  <string name="verify">Vérifier</string>
+  <string name="decrypt">Déchiffrer</string>
+  <string name="conferences">Conférences</string>
+  <string name="search">Rechercher</string>
+  <string name="create_contact">Ajouter un contact</string>
+  <string name="join_conference">Rejoindre la conférence</string>
+  <string name="delete_contact">Supprimer le contact</string>
+  <string name="view_contact_details">Afficher les détails du contact</string>
+  <string name="block_contact">Bloquer le contact</string>
+  <string name="unblock_contact">Débloquer le contact</string>
+  <string name="create">Ajouter</string>
+  <string name="contact_already_exists">Le contact existe déjà.</string>
+  <string name="join">Rejoindre</string>
+  <string name="conference_address">Adresse de la conférence</string>
+  <string name="conference_address_example">salle@conference.exemple.com</string>
+  <string name="save_as_bookmark">Enregistrer en favoris</string>
+  <string name="delete_bookmark">Supprimer le favoris</string>
+  <string name="bookmark_already_exists">Ce favoris existe déjà.</string>
+  <string name="you">Vous</string>
+  <string name="action_edit_subject">Modifier le sujet de la conférence</string>
+  <string name="conference_not_found">Conférence non trouvée</string>
+  <string name="leave">Partir</string>
+  <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
+  <string name="add_back">Ajouter également</string>
+  <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
+  <string name="publish">Publier</string>
+  <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
+  <string name="publish_avatar_explanation">Nota Bene: Les personnes ayant activé les mises jour de présence verront cette image.</string>
+  <string name="publishing">Mise à jour…</string>
+  <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre envoi d\'image</string>
+  <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
+  <string name="error_saving_avatar">Impossible de stocker l\'image sur le disque</string>
+  <string name="or_long_press_for_default">(Un appui long réinitialise le paramètre par defaut)</string>
+  <string name="error_publish_avatar_no_server_support">Votre serveur n\'autorise pas l\'envoi d\'avatars</string>
+  <string name="private_message">chuchoté</string>
+  <string name="private_message_to">pour %s</string>
+  <string name="send_private_message_to">Envoyer un message privé à %s</string>
+  <string name="connect">Se connecter</string>
+  <string name="account_already_exists">Ce compte existe déjà</string>
+  <string name="next">suivant</string>
+  <string name="server_info_session_established">Session établie</string>
+  <string name="additional_information">Informations supplémentaires</string>
+  <string name="skip">Passer</string>
+  <string name="disable_notifications">Désactiver les notifications</string>
+  <string name="disable_notifications_for_this_conversation">Désactiver les notifications pour cette conversation</string>
+  <string name="notifications_disabled">Notifications are Désactivées</string>
+  <string name="enable">Activer</string>
+  <string name="conference_requires_password">La conférence necessite un mot de passe</string>
+  <string name="enter_password">Entrer le mot de passe</string>
+  <string name="missing_presence_updates">Mise à jour de présence non connue</string>
+  <string name="request_presence_updates">Merci de demander à votre contact de fournir les mises à jour de présence.\n\n<small>Cela permettra de savoir quel matériel utilise votre contact.</small></string>
+  <string name="request_now">Demander maintenant</string>
+  <string name="delete_fingerprint">Supprimer l\'empreinte</string>
+  <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte?</string>
+  <string name="ignore">Ignorer</string>
+  <string name="without_mutual_presence_updates"><b>Attention:</b> Ceci peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+  <string name="pref_encryption_settings">Paramètres de chiffrement</string>
+  <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
+  <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
+  <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
+  <string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
+  <string name="pref_expert_options">Options avancées</string>
+  <string name="pref_expert_options_summary">A utiliser avec précautions</string>
+  <string name="title_activity_about">Sur Conversations</string>
+  <string name="pref_about_conversations_summary">Informations sur le build et les licenses</string>
+  <string name="title_pref_quiet_hours">Heures tranquilles</string>
+  <string name="title_pref_quiet_hours_start_time">Heure de début</string>
+  <string name="title_pref_quiet_hours_end_time">Heure de fin</string>
+  <string name="title_pref_enable_quiet_hours">Activer les heures tranquilles</string>
+  <string name="pref_quiet_hours_summary">Les notifications seront rendu muets pendant les heures tranquilles</string>
+  <string name="pref_use_larger_font">Augmenter la taille du texte</string>
+  <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
+  <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
+  <string name="pref_use_indicate_received">Accusé de reception</string>
+  <string name="pref_use_indicate_received_summary">Les messages recus seront marqués d\'une coche verte si disponible</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Adapter la couleur du bouton Envoyer pour indiquer le statut</string>
+  <string name="pref_expert_options_other">Autres</string>
+  <string name="pref_conference_name">Nom de la conférence </string>
+  <string name="pref_conference_name_summary">Identifier la conférence par son nom plutot que par son JID</string>
+  <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier!</string>
+  <string name="conference_banned">Vous êtes interdit de cette conférence</string>
+  <string name="conference_members_only">Cette conférence est réservée aux membres</string>
+  <string name="conference_kicked">Vous avez été éjecté de cette conférence</string>
+  <string name="using_account">utiliser le compte %s</string>
+  <string name="checking_image">Vérification de l\'image</string>
+  <string name="image_file_deleted">L\'image a été suprimée</string>
+  <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
+  <string name="check_image_filesize">Vérifier la taille de l\'image</string>
+  <string name="message_options">Options du message</string>
+  <string name="copy_text">Copier le texte</string>
+  <string name="copy_original_url">Copier l\'URL</string>
+  <string name="send_again">Envoyer de nouveau</string>
+  <string name="image_url">URL de l\'image</string>
+  <string name="message_text">Message texte</string>
+  <string name="url_copied_to_clipboard">URL copiée dans le presse-papier</string>
+  <string name="message_copied_to_clipboard">Message copié dans le presse-papier</string>
+  <string name="image_transmission_failed">Echec lors de l\'envoi de l\'image</string>
+  <string name="scan_qr_code">Scanner un QR code</string>
+  <string name="show_qr_code">Afficher le QR code</string>
+  <string name="show_block_list">Afficher la liste des contacts bloqués</string>
+  <string name="account_details">Détails du compte</string>
+  <string name="verify_otr">Vérifier l\'OTR</string>
+  <string name="remote_fingerprint">Supprimer l\'empreinte</string>
+  <string name="scan">Scanner</string>
+  <string name="or_touch_phones">(ou les touches)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Indice ou question</string>
+  <string name="shared_secret_secret">Secret partagé</string>
+  <string name="confirm">Confirmer</string>
+  <string name="in_progress">En cours</string>
+  <string name="respond">Répondre</string>
+  <string name="failed">Echoué</string>
+  <string name="secrets_do_not_match">Les secrets ne correspondent pas</string>
+  <string name="try_again">Réessayer</string>
+  <string name="finish">Terminé</string>
+  <string name="verified">Vérifié!</string>
+  <string name="smp_requested">Le contact requiert la vérification du SMP</string>
+  <string name="no_otr_session_found">Aucune session valide d\'OTR n\'a été trouvée!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Garder le service au premier-plan</string>
+  <string name="pref_keep_foreground_service_summary">Evite que le système ferme votre connexion</string>
+  <string name="choose_file">Choix d\'un fichier</string>
+  <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string>
+  <string name="download_x_file">Télecharger %s</string>
+  <string name="file">fichier</string>
+  <string name="open_x_file">Ouvrir %s</string>
+  <string name="sending_file">envoi (%1$d%% complété)</string>
+  <string name="preparing_file">Préparation du fichier pour l\'envoi</string>
+  <string name="x_file_offered_for_download">%s disponible pour téléchargement</string>
+  <string name="cancel_transmission">Annuler l\'envoi</string>
+  <string name="file_transmission_failed">Envoi du fichier échoué</string>
+  <string name="file_deleted">Le fichier a été supprimé</string>
+  <string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
+  <string name="could_not_verify_fingerprint">Impossible de vérifier l\'empreinte</string>
+  <string name="manually_verify">Vérifier manuellement</string>
+  <string name="are_you_sure_verify_fingerprint">Etes-vous sûr de vouloir vérifier l\'empreinte OTR de vos contacts?</string>
+  <string name="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
+  <string name="pref_show_dynamic_tags_summary">Afficher les tags en lecture-seule sous les contacts</string>
+  <string name="enable_notifications">Activer les notifications</string>
+  <string name="conference_with">Créer une conférence avec…</string>
+  <string name="no_conference_server_found">Aucun serveur de conférence disponible</string>
+  <string name="conference_creation_failed">Echec de la création de la conférence!</string>
+  <string name="conference_created">Conférence créée!</string>
+  <string name="secret_accepted">Secret commun accepté!</string>
+  <string name="reset">Réinitialiser</string>
+  <string name="account_image_description">Image du compte</string>
+  <string name="copy_otr_clipboard_description">Copier l\'empreinte OTR dans le presse-papier</string>
+  <string name="fetching_history_from_server">Récupérer l\'historique depuis le serveur</string>
+  <string name="no_more_history_on_server">Fin de l\'historique sur le serveur</string>
+  <string name="updating">Mise à jour…</string>
+  <string name="password_changed">Mot de passe modifié!</string>
+  <string name="could_not_change_password">Impossible de changer le mot de passe</string>
+  <string name="otr_session_not_started">Envoyez un message pour commencer la conversation chiffrée</string>
+  <string name="ask_question">Poser une question</string>
+  <string name="smp_explain_question">Si vous et votre contact avez un secret en commun connu par vous deux uniquement (comme une histoire personnelle ou même comme ce que vous avez mangé lors de votre dernière rencontre) vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous envoyez un indice ou une question à votre contact qui devra répondre en faisant attention à la casse.</string>
+  <string name="smp_explain_answer">Votre contact voudrait vous identifier de manière sûre grâce à un secret commun. Il vous envoie le message ou la question suivante.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Votre indice ne devrait pas être vide</string>
+  <string name="shared_secret_can_not_be_empty">Votre secret ne peut être vide</string>
+  <string name="manual_verification_explanation">Comparez avec soin l\'empreinte de votre contact avec celle indiquée ci-dessous.\nVous pouvez utiliser n\'importe quel moyen de communication sécurisée pour cela, tel que le télephone ou l\'envoi d\'un e-mail chiffré.</string>
+  <string name="change_password">Changer de mot de passe</string>
+  <string name="current_password">Mot de passe actuel</string>
+  <string name="new_password">Nouveau mot de passe</string>
+  <string name="password_should_not_be_empty">Le mot de passe ne peut être vide</string>
+  <string name="enable_all_accounts">Activer tous les comptes</string>
+  <string name="disable_all_accounts">Désactiver tous les comptes</string>
+  <string name="perform_action_with">Faire une action avec</string>
+  <string name="no_affiliation">Aucune affiliation</string>
+  <string name="no_role">Aucun rôle</string>
+  <string name="outcast">Banni</string>
+  <string name="member">Membre</string>
+  <string name="advanced_mode">Mode avancé</string>
+  <string name="grant_membership">Accorder le statut de membre</string>
+  <string name="remove_membership">Révoquer le statut de membre</string>
+  <string name="grant_admin_privileges">Accorder des privilèges d\'administrateur</string>
+  <string name="remove_admin_privileges">Révoquer des privilèges d\'administrateur</string>
+  <string name="remove_from_room">Supprimer de la conférence</string>
+  <string name="could_not_change_affiliation">Impossible de changer l\'affiliation de %s</string>
+  <string name="ban_from_conference">Interdire de la conférence</string>
+  <string name="removing_from_public_conference">Vous essayez de supprimer %s d\'une conférence publique. La seule façon de le faire consiste à l\'interdire définitivement.</string>
+  <string name="ban_now">Interdire maintenant</string>
+  <string name="could_not_change_role">Impossible de changer le rôle de %s</string>
+  <string name="public_conference">Conférence accessible au public</string>
+  <string name="private_conference">Conférence privée, réservée aux membres</string>
+  <string name="conference_options">Options de la conférence</string>
+  <string name="members_only">Privée (reservée aux membres)</string>
+  <string name="non_anonymous">Non anonyme</string>
+  <string name="modified_conference_options">Options de la conférence modifiée!</string>
+  <string name="could_not_modify_conference_options">Impossible de modifier les options de la conférence</string>
+  <string name="never">Jamais</string>
+  <string name="thirty_minutes">30 minutes</string>
+  <string name="one_hour">1 heure</string>
+  <string name="two_hours">2 heures</string>
+  <string name="eight_hours">8 heures</string>
+  <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
+  <string name="pref_input_options">Options de saisie</string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">image</string>
+  <string name="pdf_document">document PDF</string>
+  <string name="vcard">Contact</string>
+  <string name="received_x_file">%s reçu</string>
 </resources>
diff --git a/src/main/res/values-gl/arrays.xml b/src/main/res/values-gl/arrays.xml
deleted file mode 100644
index 19424a78..00000000
--- a/src/main/res/values-gl/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Móvil</item>
-        <item>Teléfono</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>nunca</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 637237b8..70a8f351 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1,129 +1,123 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Axustes</string>
-    <string name="action_add">Nova conversa</string>
-    <string name="action_accounts">Xestionar contas</string>
-    <string name="action_end_conversation">Terminar conversa</string>
-    <string name="action_contact_details">Detalles do contacto</string>
-    <string name="action_muc_details">Detalles da conferencia</string>
-    <string name="action_secure">Conversa segura</string>
-    <string name="action_add_account">Engadir conta</string>
-    <string name="action_edit_contact">Editar contacto</string>
-    <string name="action_delete_contact">Eliminar contacto da lista</string>
-    <string name="just_now">agora</string>
-    <string name="minutes_ago">min</string>
-    <string name="unread_conversations">conversas sen ler</string>
-    <string name="sending">enviando&#8230;</string>
-    <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres&#8230;</string>
-    <string name="nick_in_use">O apodo xa está en uso</string>
-    <string name="moderator">Moderador</string>
-    <string name="participant">Participante</string>
-    <string name="visitor">Visitante</string>
-    <string name="remove_contact_text">¿Queres eliminar a %s da túa lista?. A conversa asociada a esta conta non se eliminará.</string>
-    <string name="register_account">Rexistrar nova conta no servidor</string>
-    <string name="share_with">Compartir con</string>
-    <string name="start_conversation">Comeza conversa</string>
-    <string name="cancel">Cancelar</string>
-    <string name="crash_report_title">Conversations deteuse.</string>
-    <string name="crash_report_message">Enviando volcados de pilas axudas ao desenrolo de Conversations\n<b>Aviso:</b> Isto empregará a túa conta XMPP para enviar o volcado de pila ao desenrolador.</string>
-    <string name="send_now">Enviar agora</string>
-    <string name="send_never">Non preguntar de novo</string>
-    <string name="problem_connecting_to_account">Erro na conexión á conta</string>
-    <string name="problem_connecting_to_accounts">Erro na conexión a múltiples contas</string>
-    <string name="touch_to_fix">Pulsa aquí para xestionar as túas contass</string>
-    <string name="attach_file">Adxuntar</string>
-    <string name="not_in_roster">O contacto non está na túa lista. ¿Queres engadilo?</string>
-    <string name="add_contact">Engadir contacto</string>
-    <string name="send_failed">Erro ao enviar</string>
-    <string name="send_rejected">rechazado</string>
-    <string name="receiving_image">Recibindo arquivo de imaxe. Agarda por favor&#8230;</string>
-    <string name="preparing_image">Preparando imaxe para enviar</string>
-    <string name="action_clear_history">Limpar historial</string>
-    <string name="clear_conversation_history">Limpar historial de conversa</string>
-    <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
-    <string name="delete_messages">Borrar mensaxes</string>
-    <string name="also_end_conversation">Terminar esta conversa máis tarde</string>
-    <string name="choose_presence">Selecciona recurso del contacto</string>
-    <string name="send_plain_text_message">Enviar mensaxe de texto</string>
-    <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
-    <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
-    <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
-    <string name="download_image">Descargar imaxe</string>
-    <string name="image_offered_for_download"><i>Arquivo de imaxe ofrecido para descarga</i></string>
-    <string name="send_unencrypted">Enviar sen cifrar</string>
-    <string name="decryption_failed">Fallou o descifrado. Quizábeis non teñas a clave privada apropiada.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations emprega unha aplicación de terceiros chamada <b>OpenKeychain</b> para cifrar e descifrar mensaxes e xestionar as túas claves públicas.\n\nOpenKeychain está publicado baixo licencia GPLv3 e disponible en F-Droid e Google Play.\n\n<small>(Por favor, reinicie Conversations despois.)</small></string>
-    <string name="restart">Reiniciar</string>
-    <string name="install">Instalar</string>
-    <string name="offering">ofrecendo&#8230;</string>
-    <string name="no_pgp_key">Clave OpenPGP non atopada</string>
-    <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
-    <string name="encrypted_image_received"><i>Imaxe cifrada recibida. Pulsa para ver.</i></string>
-    <string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
-    <string name="pref_xmpp_resource">Recurso</string>
-    <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
-    <string name="pref_accept_files">Aceptar arquivos</string>
-    <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string>
-    <string name="pref_notification_settings">Axustes de notificación</string>
-    <string name="pref_notifications">Notificacións</string>
-    <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
-    <string name="pref_vibrate">Tremer</string>
-    <string name="pref_vibrate_summary">Treme cando chega unha novo mensaxe</string>
-    <string name="pref_sound">Son</string>
-    <string name="pref_sound_summary">Reproduce un ton ca notificación</string>
-    <string name="pref_conference_notifications">Notificacións de conferencia</string>
-    <string name="pref_conference_notifications_summary">Siempre notifica cuando chega unha mensaxe de conferencia e non solo cuando chega unha mensaxe destacada</string>
-    <string name="pref_notification_grace_period">Notificacións Carbons</string>
-    <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
-    <string name="pref_advanced_options">Opcións avanzadas</string>
-    <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
-    <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
-    <string name="openpgp_error">OpenKeychain reportou un erro</string>
-    <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
-    <string name="accept">Aceptar</string>
-    <string name="error">Produciuse un erro</string>
-    <string name="pref_grant_presence_updates">Suscripción de presencia</string>
-    <string name="pref_grant_presence_updates_summary">Por defecto otorgar e pedir suscripcións de presencia dos contactos que creaches</string>
-    <string name="subscriptions">Suscripcións</string>
-    <string name="your_account">A túa conta</string>
-    <string name="keys">Chaves</string>
-    <string name="send_presence_updates">Enviar actualizacións de presencia</string>
-    <string name="receive_presence_updates">Recibir actualizacións de presencia</string>
-    <string name="ask_for_presence_updates">Solicitar actualizacións de presencia</string>
-    <string name="attach_choose_picture">Seleccionar imaxe</string>
-    <string name="attach_take_picture">Facer foto</string>
-    <string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string>
-    <string name="error_not_an_image_file">O arquivo seleccionado non é unha imaxe</string>
-    <string name="error_compressing_image">Erro convertindo o arquivo de imaxe</string>
-    <string name="error_file_not_found">Arquivo non atopado</string>
-    <string name="error_io_exception">Erro xeral de I/O. ¿Quedaches sen espazo no disco?</string>
-    <string name="error_security_exception_during_image_copy">A aplicación que usas para seleccionar imaxes non proporciona suficientes permisos para leer o arquivo.\n\n<small>Utiliza un explorador de arquivos diferente para seleccionar a imaxe</small></string>
-    <string name="account_status_unknown">Descoñecido</string>
-    <string name="account_status_disabled">Deshabilitado temporalmente</string>
-    <string name="account_status_online">Conectado</string>
-    <string name="account_status_connecting">Conectando\u2026</string>
-    <string name="account_status_offline">Desconectado</string>
-    <string name="account_status_unauthorized">Non autorizado</string>
-    <string name="account_status_not_found">Servidor non atopado</string>
-    <string name="account_status_no_internet">Sen conectividade</string>
-    <string name="account_status_regis_fail">Erro no rexistro</string>
-    <string name="account_status_regis_conflict">O identificador xa está en uso</string>
-    <string name="account_status_regis_success">Rexistro completado</string>
-    <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string>
-    <string name="encryption_choice_none">Texto plano</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Editar conta</string>
-    <string name="mgmt_account_delete">Eliminar conta</string>
-    <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
-    <string name="mgmt_account_enable">Habilitar</string>
-    <string name="attach_record_voice">Grabar audio</string>
-    <string name="save">Gardar</string>
-    <string name="passwords_do_not_match">As contrasinais non coinciden</string>
-    <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
-    <string name="pref_ui_options">Opcións de interfaz</string>
-
+  <string name="action_settings">Axustes</string>
+  <string name="action_add">Nova conversa</string>
+  <string name="action_accounts">Xestionar contas</string>
+  <string name="action_end_conversation">Terminar conversa</string>
+  <string name="action_contact_details">Detalles do contacto</string>
+  <string name="action_muc_details">Detalles da conferencia</string>
+  <string name="action_secure">Conversa segura</string>
+  <string name="action_add_account">Engadir conta</string>
+  <string name="action_edit_contact">Editar contacto</string>
+  <string name="action_delete_contact">Eliminar contacto da lista</string>
+  <string name="just_now">agora</string>
+  <string name="minutes_ago">min</string>
+  <string name="unread_conversations">conversas sen ler</string>
+  <string name="sending">enviando…</string>
+  <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres…</string>
+  <string name="nick_in_use">O apodo xa está en uso</string>
+  <string name="moderator">Moderador</string>
+  <string name="participant">Participante</string>
+  <string name="visitor">Visitante</string>
+  <string name="remove_contact_text">¿Queres eliminar a %s da túa lista?. A conversa asociada a esta conta non se eliminará.</string>
+  <string name="register_account">Rexistrar nova conta no servidor</string>
+  <string name="share_with">Compartir con</string>
+  <string name="start_conversation">Comeza conversa</string>
+  <string name="cancel">Cancelar</string>
+  <string name="save">Gardar</string>
+  <string name="crash_report_title">Conversations deteuse.</string>
+  <string name="crash_report_message">Enviando volcados de pilas axudas ao desenrolo de Conversations\n<b>Aviso:</b> Isto empregará a túa conta XMPP para enviar o volcado de pila ao desenrolador.</string>
+  <string name="send_now">Enviar agora</string>
+  <string name="send_never">Non preguntar de novo</string>
+  <string name="problem_connecting_to_account">Erro na conexión á conta</string>
+  <string name="problem_connecting_to_accounts">Erro na conexión a múltiples contas</string>
+  <string name="touch_to_fix">Pulsa aquí para xestionar as túas contass</string>
+  <string name="attach_file">Adxuntar</string>
+  <string name="not_in_roster">O contacto non está na túa lista. ¿Queres engadilo?</string>
+  <string name="add_contact">Engadir contacto</string>
+  <string name="send_failed">Erro ao enviar</string>
+  <string name="send_rejected">rechazado</string>
+  <string name="preparing_image">Preparando imaxe para enviar</string>
+  <string name="action_clear_history">Limpar historial</string>
+  <string name="clear_conversation_history">Limpar historial de conversa</string>
+  <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
+  <string name="delete_messages">Borrar mensaxes</string>
+  <string name="also_end_conversation">Terminar esta conversa máis tarde</string>
+  <string name="choose_presence">Selecciona recurso del contacto</string>
+  <string name="send_plain_text_message">Enviar mensaxe de texto</string>
+  <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
+  <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
+  <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
+  <string name="download_image">Descargar imaxe</string>
+  <string name="send_unencrypted">Enviar sen cifrar</string>
+  <string name="decryption_failed">Fallou o descifrado. Quizábeis non teñas a clave privada apropiada.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations emprega unha aplicación de terceiros chamada <b>OpenKeychain</b> para cifrar e descifrar mensaxes e xestionar as túas claves públicas.\n\nOpenKeychain está publicado baixo licencia GPLv3 e disponible en F-Droid e Google Play.\n\n<small>(Por favor, reinicie Conversations despois.)</small></string>
+  <string name="restart">Reiniciar</string>
+  <string name="install">Instalar</string>
+  <string name="offering">ofrecendo…</string>
+  <string name="no_pgp_key">Clave OpenPGP non atopada</string>
+  <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
+  <string name="pref_xmpp_resource">Recurso</string>
+  <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
+  <string name="pref_accept_files">Aceptar arquivos</string>
+  <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
+  <string name="pref_notification_settings">Axustes de notificación</string>
+  <string name="pref_notifications">Notificacións</string>
+  <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
+  <string name="pref_vibrate">Tremer</string>
+  <string name="pref_vibrate_summary">Treme cando chega unha novo mensaxe</string>
+  <string name="pref_sound">Son</string>
+  <string name="pref_sound_summary">Reproduce un ton ca notificación</string>
+  <string name="pref_conference_notifications">Notificacións de conferencia</string>
+  <string name="pref_conference_notifications_summary">Siempre notifica cuando chega unha mensaxe de conferencia e non solo cuando chega unha mensaxe destacada</string>
+  <string name="pref_notification_grace_period">Notificacións Carbons</string>
+  <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
+  <string name="pref_advanced_options">Opcións avanzadas</string>
+  <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
+  <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
+  <string name="pref_ui_options">Opcións de interfaz</string>
+  <string name="openpgp_error">OpenKeychain reportou un erro</string>
+  <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
+  <string name="accept">Aceptar</string>
+  <string name="error">Produciuse un erro</string>
+  <string name="pref_grant_presence_updates">Suscripción de presencia</string>
+  <string name="pref_grant_presence_updates_summary">Por defecto otorgar e pedir suscripcións de presencia dos contactos que creaches</string>
+  <string name="subscriptions">Suscripcións</string>
+  <string name="your_account">A túa conta</string>
+  <string name="keys">Chaves</string>
+  <string name="send_presence_updates">Enviar actualizacións de presencia</string>
+  <string name="receive_presence_updates">Recibir actualizacións de presencia</string>
+  <string name="ask_for_presence_updates">Solicitar actualizacións de presencia</string>
+  <string name="attach_choose_picture">Seleccionar imaxe</string>
+  <string name="attach_take_picture">Facer foto</string>
+  <string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string>
+  <string name="error_not_an_image_file">O arquivo seleccionado non é unha imaxe</string>
+  <string name="error_compressing_image">Erro convertindo o arquivo de imaxe</string>
+  <string name="error_file_not_found">Arquivo non atopado</string>
+  <string name="error_io_exception">Erro xeral de I/O. ¿Quedaches sen espazo no disco?</string>
+  <string name="error_security_exception_during_image_copy">A aplicación que usas para seleccionar imaxes non proporciona suficientes permisos para leer o arquivo.\n\n<small>Utiliza un explorador de arquivos diferente para seleccionar a imaxe</small></string>
+  <string name="account_status_unknown">Descoñecido</string>
+  <string name="account_status_disabled">Deshabilitado temporalmente</string>
+  <string name="account_status_online">Conectado</string>
+  <string name="account_status_connecting">Conectando\u2026</string>
+  <string name="account_status_offline">Desconectado</string>
+  <string name="account_status_unauthorized">Non autorizado</string>
+  <string name="account_status_not_found">Servidor non atopado</string>
+  <string name="account_status_no_internet">Sen conectividade</string>
+  <string name="account_status_regis_fail">Erro no rexistro</string>
+  <string name="account_status_regis_conflict">O identificador xa está en uso</string>
+  <string name="account_status_regis_success">Rexistro completado</string>
+  <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string>
+  <string name="encryption_choice_none">Texto plano</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Editar conta</string>
+  <string name="mgmt_account_delete">Eliminar conta</string>
+  <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
+  <string name="mgmt_account_enable">Habilitar</string>
+  <string name="attach_record_voice">Grabar audio</string>
+  <string name="passwords_do_not_match">As contrasinais non coinciden</string>
+  <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
 </resources>
diff --git a/src/main/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml
deleted file mode 100644
index 60c0b04f..00000000
--- a/src/main/res/values-it/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Cellulare</item>
-        <item>Telefono</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>mai</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minuti</item>
-        <item>un\'ora</item>
-        <item>2 ore</item>
-        <item>8 ore</item>
-        <item>fino a nuovo avviso</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index af4dc3e0..c32e9585 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -1,338 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Impostazioni</string>
-    <string name="action_add">Nuova conversazione</string>
-    <string name="action_accounts">Gestisci utenti</string>
-    <string name="action_end_conversation">Termina questa conversazione</string>
-    <string name="action_contact_details">Dettagli del contatto</string>
-    <string name="action_muc_details">Dettagli conferenza</string>
-    <string name="action_secure">Conversazione sicura</string>
-    <string name="action_add_account">Aggiungi utente</string>
-    <string name="action_edit_contact">Modifica il nome</string>
-    <string name="action_add_phone_book">Aggiungi alla rubrica</string>
-    <string name="action_delete_contact">Cancella dalla lista</string>
-    <string name="title_activity_manage_accounts">Gestisci Utenti</string>
-    <string name="title_activity_settings">Impostazioni</string>
-    <string name="title_activity_conference_details">Dettagli conferenza</string>
-    <string name="title_activity_contact_details">Dettagli del contatto</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Condividi con Conversation</string>
-    <string name="title_activity_start_conversation">Inizia una Conversazione</string>
-    <string name="title_activity_choose_contact">Scegli contatto</string>
-    <string name="just_now">adesso</string>
-    <string name="minute_ago">1 min fa</string>
-    <string name="minutes_ago">%d min fa</string>
-    <string name="unread_conversations">Conversazioni non lette</string>
-    <string name="sending">invio&#8230;</string>
-    <string name="encrypted_message">Decifrazione del messaggio. Attendere prego&#8230;</string>
-    <string name="nick_in_use">Nome utente già in uso</string>
-    <string name="admin">Amministratore</string>
-    <string name="owner">Proprietario</string>
-    <string name="moderator">Moderatore</string>
-    <string name="participant">Partecipante</string>
-    <string name="visitor">Visitatore</string>
-    <string name="remove_contact_text">Vuoi rimuovere %s dalla tua lista contatti? La conversazione associata con questo contatto non sarà rimossa.</string>
-    <string name="remove_bookmark_text">Vuoi rimuovere il segnalibro %s? La conversazione associata con questo contatto non sarà rimossa.</string>
-    <string name="register_account">Registra un nuovo account sul server</string>
-    <string name="share_with">Condividi con</string>
-    <string name="start_conversation">Inizia Conversazione</string>
-    <string name="invite_contact">Invita Contatto</string>
-    <string name="contacts">Contatti</string>
-    <string name="cancel">Annulla</string>
-    <string name="add">Aggiungi</string>
-    <string name="edit">Modifica</string>
-    <string name="delete">Elimina</string>
-    <string name="save">Salva</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Errore di Conversations</string>
-    <string name="crash_report_message">Se scegli di inviare una segnalazione dell\'errore aiuterai lo sviluppo di Conversations\n<b>Attenzione:</b> Questo utilizzerà il tuo account XMPP per inviare la segnalazione agli sviluppatori.</string>
-    <string name="send_now">Invia adesso</string>
-    <string name="send_never">Non chiedere mai più</string>
-    <string name="problem_connecting_to_account">Impossibile collegarsi tramite questo utente</string>
-    <string name="problem_connecting_to_accounts">Impossibile collegarsi tramite più utenti</string>
-    <string name="touch_to_fix">Tocca qui per gestire i tuoi utenti</string>
-    <string name="attach_file">Allega file</string>
-    <string name="not_in_roster">Il contatto non è nella tua lista. Vuoi aggiungerlo?</string>
-    <string name="add_contact">Aggiungi contatto</string>
-    <string name="send_failed">Invio fallito</string>
-    <string name="send_rejected">rifiutato</string>
-    <string name="receiving_image">Ricezione di un\'immagine. Attendere prego&#8230;</string>
-    <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
-    <string name="action_clear_history">Pulisci la cronologia</string>
-    <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
-    <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
-    <string name="delete_messages">Elimina messaggi</string>
-    <string name="also_end_conversation">Termina questa conversazione in seguito</string>
-    <string name="choose_presence">Choose presence to contact</string>
-    <string name="send_plain_text_message">Messaggio non cifrato</string>
-    <string name="send_otr_message">Messaggio OTR</string>
-    <string name="send_pgp_message">Messaggio OpenPGP</string>
-    <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
-    <string name="download_image">Scarica Immagine</string>
-    <string name="image_offered_for_download"><i>Immagine disponibile per il download</i></string>
-    <string name="send_unencrypted">Invia non cifrato</string>
-    <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations usa una app di terze parti chiamata <b>OpenKeychain</b> per cifrare e decifrare i messaggi per gestire le tue chiavi pubbliche.\n\nOpenKeychain è rilasciato secondo i termini della GPLv3 ed è disponibile sia su F-Droid, che su Google Play.\n\n<small>(Riavvia Conversations in seguito.)</small></string>
-    <string name="restart">Riavvia</string>
-    <string name="install">Installa</string>
-    <string name="offering">offrendo&#8230;</string>
-    <string name="waiting">in attesa&#8230;</string>
-    <string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
-    <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
-    <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
-    <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perché i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
-    <string name="encrypted_image_received"><i>Immagine cifrata ricevuta. Tocca per decifrare e mostrare.</i></string>
-    <string name="image_file"><i>Immagine ricevuta. Tocca per mostrare</i></string>
-    <string name="pref_general">Generale</string>
-    <string name="pref_xmpp_resource">Risorsa XMPP</string>
-    <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
-    <string name="pref_accept_files">Accetta i file</string>
-    <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di&#8230;</string>
-    <string name="pref_notification_settings">Impostazioni di Notifica</string>
-    <string name="pref_notifications">Notifiche</string>
-    <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
-    <string name="pref_vibrate">Vibra</string>
-    <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string>
-    <string name="pref_sound">Suono</string>
-    <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
-    <string name="pref_conference_notifications">Notifiche Conferenze</string>
-    <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un nuovo messaggio da una conferenza, invece che solo quando in primo piano</string>
-    <string name="pref_notification_grace_period">Periodo tra notifiche</string>
-    <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
-    <string name="pref_advanced_options">Opzioni Avanzate</string>
-    <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
-    <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell\'errore aiuterai lo sviluppo di Conversations</string>
-    <string name="pref_confirm_messages">Conferma Messaggi</string>
-    <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l\'hai letto</string>
-    <string name="pref_ui_options">Opzioni Interfaccia</string>
-    <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
-    <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
-    <string name="accept">Accetta</string>
-    <string name="error">Si è verificato un errore</string>
-    <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
-    <string name="pref_grant_presence_updates_summary">Concedi e chiedi preventivamente la sottoscrizione della presenza ai contatti che hai creato</string>
-    <string name="subscriptions">Sottoscrizioni</string>
-    <string name="your_account">Il tuo utente</string>
-    <string name="keys">Chiavi</string>
-    <string name="send_presence_updates">Invia aggiornamenti della presenza</string>
-    <string name="receive_presence_updates">Ricevi aggiornamenti della presenza</string>
-    <string name="ask_for_presence_updates">Chiedi aggiornamenti della presenza</string>
-    <string name="attach_choose_picture">Scegli un\'immagine</string>
-    <string name="attach_take_picture">Foto</string>
-    <string name="preemptively_grant">Concedi aggiornamenti della presenza preventivamente</string>
-    <string name="error_not_an_image_file">Il file selezionato non è un\'immagine</string>
-    <string name="error_compressing_image">Errore durante la conversione dell\'immagine</string>
-    <string name="error_file_not_found">File non trovato</string>
-    <string name="error_io_exception">Errore di I/O generico. Forse hai esaurito lo spazio?</string>
-    <string name="error_security_exception_during_image_copy">L\'app che hai usato per selezionare questa immagine non ci ha fornito permessi sufficienti per leggere il file.\n\n<small>Usa un file manager differente per scegliere un\'immagine</small></string>
-    <string name="account_status_unknown">Sconosciuto</string>
-    <string name="account_status_disabled">Disabilitato temporaneamente</string>
-    <string name="account_status_online">Online</string>
-    <string name="account_status_connecting">In connessione\u2026</string>
-    <string name="account_status_offline">Offline</string>
-    <string name="account_status_unauthorized">Non autorizzato</string>
-    <string name="account_status_not_found">Server non trovato</string>
-    <string name="account_status_no_internet">Connettività assente</string>
-    <string name="account_status_regis_fail">Registrazione fallita</string>
-    <string name="account_status_regis_conflict">Nome utente già in uso</string>
-    <string name="account_status_regis_success">Registrazione completata</string>
-    <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
-    <string name="account_status_security_error">Errore di sicurezza</string>
-    <string name="account_status_incompatible_server">Server non compatibile</string>
-    <string name="encryption_choice_none">Testo semplice</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Modifica utente</string>
-    <string name="mgmt_account_delete">Elimina utente</string>
-    <string name="mgmt_account_disable">Disabilita temporaneamente</string>
-    <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
-    <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
-    <string name="mgmt_account_enable">Abilita utente</string>
-    <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
-    <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
-    <string name="attach_record_voice">Registra la voce</string>
-    <string name="account_settings_jabber_id">ID Jabber</string>
-    <string name="account_settings_password">Password</string>
-    <string name="account_settings_example_jabber_id">utente@esempio.com</string>
-    <string name="account_settings_confirm_password">Conferma password</string>
-    <string name="password">Password</string>
-    <string name="confirm_password">Conferma password</string>
-    <string name="passwords_do_not_match">Le Password non corrispondono</string>
-    <string name="invalid_jid">Questo non è un ID Jabber valido</string>
-    <string name="error_out_of_memory">Memoria esaurita. L\'immagine è tropppo grande</string>
-    <string name="add_phone_book_text">Vuoi aggiungere %s alla rubrica del telefono?</string>
-    <string name="contact_status_online">online</string>
-    <string name="contact_status_free_to_chat">vuole chattare</string>
-    <string name="contact_status_away">assente</string>
-    <string name="contact_status_extended_away">assenza prolungata</string>
-    <string name="contact_status_do_not_disturb">non disturbare</string>
-    <string name="contact_status_offline">offline</string>
-    <string name="muc_details_conference">Conferenza</string>
-    <string name="muc_details_other_members">Altri Membri</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">disponibile</string>
-    <string name="server_info_unavailable">non disponibile</string>
-    <string name="missing_public_keys">Annuncio chiave pubblica non effettuato</string>
-    <string name="last_seen_now">visto adesso</string>
-    <string name="last_seen_min">visto 1 minuto fa</string>
-    <string name="last_seen_mins">visto %d minuti fa</string>
-    <string name="last_seen_hour">visto 1 ora fa</string>
-    <string name="last_seen_hours">visto %d ore fa</string>
-    <string name="last_seen_day">visto 1 giorno fa</string>
-    <string name="last_seen_days">visto %d giorni fa</string>
-    <string name="never_seen">mai visto</string>
-    <string name="install_openkeychain">Messaggio cifrato. Installa OpenKeychain per decifrare.</string>
-    <string name="unknown_otr_fingerprint">Impronta OTR sconosciuta</string>
-    <string name="openpgp_messages_found">Messaggi cifrati con OpenPGP trovati</string>
-    <string name="reception_failed">Ricezione fallita</string>
-    <string name="your_fingerprint">La tua impronta</string>
-    <string name="otr_fingerprint">Impronta OTR</string>
-    <string name="verify">Verifica</string>
-    <string name="decrypt">Decripta</string>
-    <string name="conferences">Conferenze</string>
-    <string name="search">Cerca</string>
-    <string name="create_contact">Crea Contatto</string>
-    <string name="join_conference">Entra in Conferenza</string>
-    <string name="delete_contact">Elimina Contatto</string>
-    <string name="view_contact_details">Mostra dettagli contatto</string>
-    <string name="create">Crea</string>
-    <string name="contact_already_exists">Il contatto esiste già</string>
-    <string name="join">Entra</string>
-    <string name="conference_address">Indirizzo conferenza</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">Salva come segnalibro</string>
-    <string name="delete_bookmark">Elimina segnalibro</string>
-    <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
-    <string name="you">Tu</string>
-    <string name="action_edit_subject">Modifica soggetto conferenza</string>
-    <string name="conference_not_found">Conferenza non trovata</string>
-    <string name="leave">Abbandona</string>
-    <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
-    <string name="add_back">Add back</string>
-    <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string>
-    <string name="publish">Pubblica</string>
-    <string name="touch_to_choose_picture">Tocca l\'avatar per selezionare l\'immagine dalla galleria</string>
-    <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string>
-    <string name="publishing">Pubblicazione&#8230;</string>
-    <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string>
-    <string name="error_publish_avatar_converting">Qualcosa è andato storto durante la conversione della tua immagine</string>
-    <string name="error_saving_avatar">Impossibile salvare l\'avatar sulla memoria interna</string>
-    <string name="or_long_press_for_default">(O premi a lungo per ripristinare le impostazioni di default)</string>
-    <string name="error_publish_avatar_no_server_support">Il tuo server non supporta la pubblicazione degli avatar</string>
-    <string name="private_message">sussurrato</string>
-    <string name="private_message_to">a %s</string>
-    <string name="send_private_message_to">Invia messaggio privato a %s</string>
-    <string name="connect">Connetti</string>
-    <string name="account_already_exists">Questo utente esiste già</string>
-    <string name="next">Successivo</string>
-    <string name="server_info_session_established">Sessione corrente stabilita</string>
-    <string name="additional_information">Informazioni Aggiuntive</string>
-    <string name="skip">Salta</string>
-    <string name="disable_notifications">Disabilita le notifiche</string>
-    <string name="disable_notifications_for_this_conversation">Disabilita le notifiche per questa conversazione</string>
-    <string name="notifications_disabled">Le notifiche sono disabilitate</string>
-    <string name="enable">Abilita</string>
-    <string name="conference_requires_password">La conferenza richiede una password</string>
-    <string name="enter_password">Inserisci la password</string>
-    <string name="missing_presence_updates">Aggiornamenti della presenza del contatto mancanti</string>
-    <string name="request_presence_updates">Richiedi gli aggiornamenti della presenza dal tuo contatto.\n\n<small>Questo verrà usato per determinare quali client sta usando il tuo contatto.</small></string>
-    <string name="request_now">Rechiedi adesso</string>
-    <string name="delete_fingerprint">Elimina Impronta</string>
-    <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
-    <string name="ignore">Ignora</string>
-    <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
-    <string name="pref_encryption_settings">Impostazioni di cifratura</string>
-    <string name="pref_force_encryption">Forza cifratura end-to-end</string>
-    <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
-    <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
-    <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
-    <string name="pref_enable_legacy_ssl">Abilita il vecchio SSL</string>
-    <string name="pref_enable_legacy_ssl_summary">Abilita il supporto per i server SSLv3. Attenzione: SSLv3 è considerato insicuro.</string>
-    <string name="pref_expert_options">Opzioni da Esperto</string>
-    <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
-    <string name="title_activity_about">Info su Conversations</string>
-    <string name="pref_about_conversations_summary">Informazioni sulla licenza</string>
-    <string name="pref_use_larger_font">Aumenta la dimensione dei font</string>
-    <string name="pref_use_larger_font_summary">Usa font più grandi in tutta l\'app</string>
-    <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato di un contatto</string>
-    <string name="pref_use_indicate_received">Richiedi la ricevuta di ritorno</string>
-    <string name="pref_use_indicate_received_summary">I messaggi ricevuti verranno contrassegnati con una spunta verde se supportato</string>
-    <string name="pref_expert_options_other">Altro</string>
-    <string name="pref_conference_name">Nome della conferenza</string>
-    <string name="pref_conference_name_summary">Usa il soggetto della stanza al posto del JID per identificare le conferenze</string>
-    <string name="toast_message_otr_fingerprint">Impronta OTR copiata!</string>
-    <string name="conference_banned">Sei stato bandito da questa conferenza</string>
-    <string name="conference_members_only">Questa conferenza è solo per membri</string>
-    <string name="conference_kicked">Sei stato buttato fuori dalla conferenza</string>
-    <string name="using_account">usando l\'utente %s</string>
-    <string name="checking_image">Controlla immagine su HTTP</string>
-    <string name="image_file_deleted">Il file dell\'immagine è stato cancellato</string>
-    <string name="not_connected_try_again">Non sei connesso. Riprova più tardi</string>
-    <string name="check_image_filesize">Controlla le dimensioni dell\'immagine</string>
-    <string name="message_options">Opzioni del messaggio</string>
-    <string name="copy_text">Copia testo</string>
-    <string name="share_image">Condividi immagine</string>
-    <string name="copy_original_url">Copia URL originale</string>
-    <string name="send_again">Invia di nuovo</string>
-    <string name="image_url">URL immagine</string>
-    <string name="message_text">Messaggio di testo</string>
-    <string name="url_copied_to_clipboard">URL copiato</string>
-    <string name="message_copied_to_clipboard">Messaggio copiato</string>
-    <string name="image_transmission_failed">Trasmissione dell\'immagine fallita</string>
-    <string name="scan_qr_code">Scansiona codice QR</string>
-    <string name="show_qr_code">Mostra codice QR</string>
-    <string name="account_details">Dettagli utente</string>
-    <string name="verify_otr">Verifica OTR</string>
-    <string name="remote_fingerprint">Impronta remota</string>
-    <string name="scan">scan</string>
-    <string name="or_touch_phones">(o fai toccare i dispositivi)</string>
-    <string name="smp">Socialist Millionaire Protocol</string>
-    <string name="shared_secret_hint">Suggerimento o Domanda</string>
-    <string name="shared_secret_secret">Segreto condiviso</string>
-    <string name="confirm">Conferma</string>
-    <string name="in_progress">In corso</string>
-    <string name="respond">Rispondi</string>
-    <string name="failed">Fallito</string>
-    <string name="secrets_do_not_match">I segreti non corrispondono</string>
-    <string name="try_again">Prova di nuovo</string>
-    <string name="finish">Fine</string>
-    <string name="verified">Verificato!</string>
-    <string name="smp_requested">Il contatto ha richiesto la verifica SMP</string>
-    <string name="no_otr_session_found">Non è stata trovata nessuna sessione OTR valida!</string>
-    <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Tocca per disabilitare il servizio in primo piano</string>
-    <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
-    <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
-    <string name="choose_file">Scegli file</string>
-    <string name="receiving_file">Ricezione di %1$s file (%2$d%% completato)</string>
-    <string name="download_file">Scarica %s file</string>
-    <string name="open_file">Apri %s file</string>
-    <string name="sending_file">invio (%1$d%% completato)</string>
-    <string name="preparing_file">Preparazione alla trasmissione del file</string>
-    <string name="file_offered_for_download">Offerto un file da scaricare</string>
-    <string name="file">%s file</string>
-    <string name="cancel_transmission">Annulla trasmissione</string>
-    <string name="file_transmission_failed">trasmissione del file fallita</string>
-    <string name="file_deleted">Il file è stato eliminato</string>
-    <string name="no_application_found_to_open_file">Nessuna applicazione trovata per aprire il file</string>
-    <string name="could_not_verify_fingerprint">Impronta non verificata</string>
-    <string name="manually_verify">Verifica manuale</string>
-    <string name="are_you_sure_verify_fingerprint">Sei sicuro di voler verificare l\'impronta OTR del contatto?</string>
-    <string name="pref_show_dynamic_tags">Mostra tag dinamici</string>
-    <string name="pref_show_dynamic_tags_summary">Mostra tag in sola lettura sotto i contatti</string>
-    <string name="enable_notifications">Abilita le notifiche</string>
-    <string name="conference_with">Crea conferenza con…</string>
-    <string name="no_conference_server_found">Nessun server per conferenza trovato</string>
-    <string name="conference_creation_failed">Creazione della conferenza fallita!</string>
-    <string name="conference_created">Conferenza creata!</string>
-    <string name="secret_accepted">Segreto accettato!</string>
-    <string name="reset">Reset</string>
-    <string name="account_image_description">Avatar utente</string>
-    <string name="copy_otr_clipboard_description">Copia impronta OTR</string>
+  <string name="action_settings">Impostazioni</string>
+  <string name="action_add">Nuova conversazione</string>
+  <string name="action_accounts">Gestisci utenti</string>
+  <string name="action_end_conversation">Termina questa conversazione</string>
+  <string name="action_contact_details">Dettagli del contatto</string>
+  <string name="action_muc_details">Dettagli conferenza</string>
+  <string name="action_secure">Conversazione sicura</string>
+  <string name="action_add_account">Aggiungi utente</string>
+  <string name="action_edit_contact">Modifica il nome</string>
+  <string name="action_add_phone_book">Aggiungi alla rubrica</string>
+  <string name="action_delete_contact">Cancella dalla lista</string>
+  <string name="action_block_contact">Blocca contatto</string>
+  <string name="action_unblock_contact">Sblocca contatto</string>
+  <string name="action_block_domain">Blocca dominio</string>
+  <string name="action_unblock_domain">Sblocca dominio</string>
+  <string name="title_activity_manage_accounts">Gestisci Utenti</string>
+  <string name="title_activity_settings">Impostazioni</string>
+  <string name="title_activity_conference_details">Dettagli conferenza</string>
+  <string name="title_activity_contact_details">Dettagli del contatto</string>
+  <string name="title_activity_sharewith">Condividi con Conversation</string>
+  <string name="title_activity_start_conversation">Inizia una Conversazione</string>
+  <string name="title_activity_choose_contact">Scegli contatto</string>
+  <string name="title_activity_block_list">Lista nera</string>
+  <string name="just_now">adesso</string>
+  <string name="minute_ago">1 min fa</string>
+  <string name="minutes_ago">%d min fa</string>
+  <string name="unread_conversations">Conversazioni non lette</string>
+  <string name="sending">invio…</string>
+  <string name="encrypted_message">Decifrazione del messaggio. Attendere prego…</string>
+  <string name="nick_in_use">Nome utente già in uso</string>
+  <string name="admin">Amministratore</string>
+  <string name="owner">Proprietario</string>
+  <string name="moderator">Moderatore</string>
+  <string name="participant">Partecipante</string>
+  <string name="visitor">Visitatore</string>
+  <string name="remove_contact_text">Vuoi rimuovere %s dalla tua lista contatti? La conversazione associata con questo contatto non sarà rimossa.</string>
+  <string name="block_contact_text">Vorresti impedire a %s di inviarti messaggi?</string>
+  <string name="unblock_contact_text">Vorresti permettere a %s di inviarti messaggi?</string>
+  <string name="block_domain_text">Bloccare tutti i contatti da %s?</string>
+  <string name="unblock_domain_text">Sbloccare tutti i contatti da %s?</string>
+  <string name="contact_blocked">Contatto bloccato</string>
+  <string name="remove_bookmark_text">Vuoi rimuovere il segnalibro %s? La conversazione associata con questo contatto non sarà rimossa.</string>
+  <string name="register_account">Registra un nuovo account sul server</string>
+  <string name="change_password_on_server">Cambia la password sul server</string>
+  <string name="share_with">Condividi con</string>
+  <string name="start_conversation">Inizia Conversazione</string>
+  <string name="invite_contact">Invita Contatto</string>
+  <string name="contacts">Contatti</string>
+  <string name="cancel">Annulla</string>
+  <string name="set">Imposta</string>
+  <string name="add">Aggiungi</string>
+  <string name="edit">Modifica</string>
+  <string name="delete">Elimina</string>
+  <string name="block">Blocca</string>
+  <string name="unblock">Sblocca</string>
+  <string name="save">Salva</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Errore di Conversations</string>
+  <string name="crash_report_message">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations\n<b>Attenzione:</b> Questo utilizzerà il tuo account XMPP per inviare la segnalazione agli sviluppatori.</string>
+  <string name="send_now">Invia adesso</string>
+  <string name="send_never">Non chiedere mai più</string>
+  <string name="problem_connecting_to_account">Impossibile collegarsi tramite questo utente</string>
+  <string name="problem_connecting_to_accounts">Impossibile collegarsi tramite più utenti</string>
+  <string name="touch_to_fix">Tocca qui per gestire i tuoi utenti</string>
+  <string name="attach_file">Allega file</string>
+  <string name="not_in_roster">Il contatto non è nella tua lista. Vuoi aggiungerlo?</string>
+  <string name="add_contact">Aggiungi contatto</string>
+  <string name="send_failed">Invio fallito</string>
+  <string name="send_rejected">rifiutato</string>
+  <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
+  <string name="action_clear_history">Pulisci la cronologia</string>
+  <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
+  <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
+  <string name="delete_messages">Elimina messaggi</string>
+  <string name="also_end_conversation">Termina questa conversazione in seguito</string>
+  <string name="choose_presence">Choose presence to contact</string>
+  <string name="send_plain_text_message">Messaggio non cifrato</string>
+  <string name="send_otr_message">Messaggio OTR</string>
+  <string name="send_pgp_message">Messaggio OpenPGP</string>
+  <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
+  <string name="download_image">Scarica Immagine</string>
+  <string name="send_unencrypted">Invia non cifrato</string>
+  <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations usa una app di terze parti chiamata <b>OpenKeychain</b> per cifrare e decifrare i messaggi per gestire le tue chiavi pubbliche.\n\nOpenKeychain è rilasciato secondo i termini della GPLv3 ed è disponibile sia su F-Droid, che su Google Play.\n\n<small>(Riavvia Conversations in seguito.)</small></string>
+  <string name="restart">Riavvia</string>
+  <string name="install">Installa</string>
+  <string name="offering">offrendo…</string>
+  <string name="waiting">in attesa…</string>
+  <string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
+  <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
+  <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
+  <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perché i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
+  <string name="pref_general">Generale</string>
+  <string name="pref_xmpp_resource">Risorsa XMPP</string>
+  <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
+  <string name="pref_accept_files">Accetta i file</string>
+  <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string>
+  <string name="pref_notification_settings">Impostazioni di Notifica</string>
+  <string name="pref_notifications">Notifiche</string>
+  <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
+  <string name="pref_vibrate">Vibra</string>
+  <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string>
+  <string name="pref_sound">Suono</string>
+  <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
+  <string name="pref_conference_notifications">Notifiche Conferenze</string>
+  <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un nuovo messaggio da una conferenza, invece che solo quando in primo piano</string>
+  <string name="pref_notification_grace_period">Periodo tra notifiche</string>
+  <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
+  <string name="pref_advanced_options">Opzioni Avanzate</string>
+  <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
+  <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations</string>
+  <string name="pref_confirm_messages">Conferma Messaggi</string>
+  <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l’hai letto</string>
+  <string name="pref_ui_options">Opzioni Interfaccia</string>
+  <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
+  <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
+  <string name="accept">Accetta</string>
+  <string name="error">Si è verificato un errore</string>
+  <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
+  <string name="pref_grant_presence_updates_summary">Concedi e chiedi preventivamente la sottoscrizione della presenza ai contatti che hai creato</string>
+  <string name="subscriptions">Sottoscrizioni</string>
+  <string name="your_account">Il tuo utente</string>
+  <string name="keys">Chiavi</string>
+  <string name="send_presence_updates">Invia aggiornamenti della presenza</string>
+  <string name="receive_presence_updates">Ricevi aggiornamenti della presenza</string>
+  <string name="ask_for_presence_updates">Chiedi aggiornamenti della presenza</string>
+  <string name="attach_choose_picture">Scegli un’immagine</string>
+  <string name="attach_take_picture">Foto</string>
+  <string name="preemptively_grant">Concedi aggiornamenti della presenza preventivamente</string>
+  <string name="error_not_an_image_file">Il file selezionato non è un’immagine</string>
+  <string name="error_compressing_image">Errore durante la conversione dell’immagine</string>
+  <string name="error_file_not_found">File non trovato</string>
+  <string name="error_io_exception">Errore di I/O generico. Forse hai esaurito lo spazio?</string>
+  <string name="error_security_exception_during_image_copy">L’app che hai usato per selezionare questa immagine non ci ha fornito permessi sufficienti per leggere il file.\n\n<small>Usa un file manager differente per scegliere un’immagine</small></string>
+  <string name="account_status_unknown">Sconosciuto</string>
+  <string name="account_status_disabled">Disabilitato temporaneamente</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_connecting">In connessione\u2026</string>
+  <string name="account_status_offline">Offline</string>
+  <string name="account_status_unauthorized">Non autorizzato</string>
+  <string name="account_status_not_found">Server non trovato</string>
+  <string name="account_status_no_internet">Connettività assente</string>
+  <string name="account_status_regis_fail">Registrazione fallita</string>
+  <string name="account_status_regis_conflict">Nome utente già in uso</string>
+  <string name="account_status_regis_success">Registrazione completata</string>
+  <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
+  <string name="account_status_security_error">Errore di sicurezza</string>
+  <string name="account_status_incompatible_server">Server non compatibile</string>
+  <string name="encryption_choice_none">Testo semplice</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Modifica utente</string>
+  <string name="mgmt_account_delete">Elimina utente</string>
+  <string name="mgmt_account_disable">Disabilita temporaneamente</string>
+  <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
+  <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
+  <string name="mgmt_account_enable">Abilita utente</string>
+  <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
+  <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
+  <string name="attach_record_voice">Registra la voce</string>
+  <string name="account_settings_jabber_id">ID Jabber</string>
+  <string name="account_settings_password">Password</string>
+  <string name="account_settings_example_jabber_id">utente@esempio.com</string>
+  <string name="account_settings_confirm_password">Conferma password</string>
+  <string name="password">Password</string>
+  <string name="confirm_password">Conferma password</string>
+  <string name="passwords_do_not_match">Le Password non corrispondono</string>
+  <string name="invalid_jid">Questo non è un ID Jabber valido</string>
+  <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
+  <string name="add_phone_book_text">Vuoi aggiungere %s alla rubrica del telefono?</string>
+  <string name="contact_status_online">online</string>
+  <string name="contact_status_free_to_chat">vuole chattare</string>
+  <string name="contact_status_away">assente</string>
+  <string name="contact_status_extended_away">assenza prolungata</string>
+  <string name="contact_status_do_not_disturb">non disturbare</string>
+  <string name="contact_status_offline">offline</string>
+  <string name="muc_details_conference">Conferenza</string>
+  <string name="muc_details_other_members">Altri Membri</string>
+  <string name="server_info_show_more">Info server</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">disponibile</string>
+  <string name="server_info_unavailable">non disponibile</string>
+  <string name="missing_public_keys">Annuncio chiave pubblica non effettuato</string>
+  <string name="last_seen_now">visto adesso</string>
+  <string name="last_seen_min">visto 1 minuto fa</string>
+  <string name="last_seen_mins">visto %d minuti fa</string>
+  <string name="last_seen_hour">visto 1 ora fa</string>
+  <string name="last_seen_hours">visto %d ore fa</string>
+  <string name="last_seen_day">visto 1 giorno fa</string>
+  <string name="last_seen_days">visto %d giorni fa</string>
+  <string name="never_seen">mai visto</string>
+  <string name="install_openkeychain">Messaggio cifrato. Installa OpenKeychain per decifrare.</string>
+  <string name="unknown_otr_fingerprint">Impronta OTR sconosciuta</string>
+  <string name="openpgp_messages_found">Messaggi cifrati con OpenPGP trovati</string>
+  <string name="reception_failed">Ricezione fallita</string>
+  <string name="your_fingerprint">La tua impronta</string>
+  <string name="otr_fingerprint">Impronta OTR</string>
+  <string name="verify">Verifica</string>
+  <string name="decrypt">Decripta</string>
+  <string name="conferences">Conferenze</string>
+  <string name="search">Cerca</string>
+  <string name="create_contact">Crea Contatto</string>
+  <string name="join_conference">Entra in Conferenza</string>
+  <string name="delete_contact">Elimina Contatto</string>
+  <string name="view_contact_details">Mostra dettagli contatto</string>
+  <string name="block_contact">Blocca contatto</string>
+  <string name="unblock_contact">Sblocca contatto</string>
+  <string name="create">Crea</string>
+  <string name="contact_already_exists">Il contatto esiste già</string>
+  <string name="join">Entra</string>
+  <string name="conference_address">Indirizzo conferenza</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">Salva come segnalibro</string>
+  <string name="delete_bookmark">Elimina segnalibro</string>
+  <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
+  <string name="you">Tu</string>
+  <string name="action_edit_subject">Modifica soggetto conferenza</string>
+  <string name="conference_not_found">Conferenza non trovata</string>
+  <string name="leave">Abbandona</string>
+  <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
+  <string name="add_back">Add back</string>
+  <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string>
+  <string name="publish">Pubblica</string>
+  <string name="touch_to_choose_picture">Tocca l’avatar per selezionare l’immagine dalla galleria</string>
+  <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string>
+  <string name="publishing">Pubblicazione…</string>
+  <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string>
+  <string name="error_publish_avatar_converting">Qualcosa è andato storto durante la conversione della tua immagine</string>
+  <string name="error_saving_avatar">Impossibile salvare l’avatar sulla memoria interna</string>
+  <string name="or_long_press_for_default">(O premi a lungo per ripristinare le impostazioni di default)</string>
+  <string name="error_publish_avatar_no_server_support">Il tuo server non supporta la pubblicazione degli avatar</string>
+  <string name="private_message">sussurrato</string>
+  <string name="private_message_to">a %s</string>
+  <string name="send_private_message_to">Invia messaggio privato a %s</string>
+  <string name="connect">Connetti</string>
+  <string name="account_already_exists">Questo utente esiste già</string>
+  <string name="next">Successivo</string>
+  <string name="server_info_session_established">Sessione corrente stabilita</string>
+  <string name="additional_information">Informazioni Aggiuntive</string>
+  <string name="skip">Salta</string>
+  <string name="disable_notifications">Disabilita le notifiche</string>
+  <string name="disable_notifications_for_this_conversation">Disabilita le notifiche per questa conversazione</string>
+  <string name="notifications_disabled">Le notifiche sono disabilitate</string>
+  <string name="enable">Abilita</string>
+  <string name="conference_requires_password">La conferenza richiede una password</string>
+  <string name="enter_password">Inserisci la password</string>
+  <string name="missing_presence_updates">Aggiornamenti della presenza del contatto mancanti</string>
+  <string name="request_presence_updates">Richiedi gli aggiornamenti della presenza dal tuo contatto.\n\n<small>Questo verrà usato per determinare quali client sta usando il tuo contatto.</small></string>
+  <string name="request_now">Rechiedi adesso</string>
+  <string name="delete_fingerprint">Elimina Impronta</string>
+  <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
+  <string name="ignore">Ignora</string>
+  <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
+  <string name="pref_encryption_settings">Impostazioni di cifratura</string>
+  <string name="pref_force_encryption">Forza cifratura end-to-end</string>
+  <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
+  <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
+  <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
+  <string name="pref_expert_options">Opzioni da Esperto</string>
+  <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
+  <string name="title_activity_about">Info su Conversations</string>
+  <string name="pref_about_conversations_summary">Informazioni sulla licenza</string>
+  <string name="title_pref_quiet_hours">Ore di Quiete</string>
+  <string name="title_pref_quiet_hours_start_time">Orario inizio</string>
+  <string name="title_pref_quiet_hours_end_time">Orario fine</string>
+  <string name="title_pref_enable_quiet_hours">Abilita ore di quiete</string>
+  <string name="pref_quiet_hours_summary">Le notifiche verranno silenziate durante le ore di quiete</string>
+  <string name="pref_use_larger_font">Aumenta la dimensione dei caratteri</string>
+  <string name="pref_use_larger_font_summary">Usa font più grandi in tutta l’app</string>
+  <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
+  <string name="pref_use_indicate_received">Richiedi la ricevuta di ritorno</string>
+  <string name="pref_use_indicate_received_summary">I messaggi ricevuti verranno contrassegnati con una spunta verde se supportato</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato di un contatto</string>
+  <string name="pref_expert_options_other">Altro</string>
+  <string name="pref_conference_name">Nome della conferenza</string>
+  <string name="pref_conference_name_summary">Usa il soggetto della stanza al posto del JID per identificare le conferenze</string>
+  <string name="toast_message_otr_fingerprint">Impronta OTR copiata!</string>
+  <string name="conference_banned">Sei stato bandito da questa conferenza</string>
+  <string name="conference_members_only">Questa conferenza è solo per membri</string>
+  <string name="conference_kicked">Sei stato buttato fuori dalla conferenza</string>
+  <string name="using_account">usando l’utente %s</string>
+  <string name="checking_image">Controlla immagine su HTTP</string>
+  <string name="image_file_deleted">Il file dell’immagine è stato cancellato</string>
+  <string name="not_connected_try_again">Non sei connesso. Riprova più tardi</string>
+  <string name="check_image_filesize">Controlla le dimensioni dell’immagine</string>
+  <string name="message_options">Opzioni del messaggio</string>
+  <string name="copy_text">Copia testo</string>
+  <string name="copy_original_url">Copia URL originale</string>
+  <string name="send_again">Invia di nuovo</string>
+  <string name="image_url">URL immagine</string>
+  <string name="message_text">Messaggio di testo</string>
+  <string name="url_copied_to_clipboard">URL copiato</string>
+  <string name="message_copied_to_clipboard">Messaggio copiato</string>
+  <string name="image_transmission_failed">Trasmissione dell’immagine fallita</string>
+  <string name="scan_qr_code">Scansiona codice QR</string>
+  <string name="show_qr_code">Mostra codice QR</string>
+  <string name="account_details">Dettagli utente</string>
+  <string name="verify_otr">Verifica OTR</string>
+  <string name="remote_fingerprint">Impronta remota</string>
+  <string name="scan">scan</string>
+  <string name="or_touch_phones">(o fai toccare i dispositivi)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Suggerimento o Domanda</string>
+  <string name="shared_secret_secret">Segreto condiviso</string>
+  <string name="confirm">Conferma</string>
+  <string name="in_progress">In corso</string>
+  <string name="respond">Rispondi</string>
+  <string name="failed">Fallito</string>
+  <string name="secrets_do_not_match">I segreti non corrispondono</string>
+  <string name="try_again">Prova di nuovo</string>
+  <string name="finish">Fine</string>
+  <string name="verified">Verificato!</string>
+  <string name="smp_requested">Il contatto ha richiesto la verifica SMP</string>
+  <string name="no_otr_session_found">Non è stata trovata nessuna sessione OTR valida!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
+  <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
+  <string name="choose_file">Scegli file</string>
+  <string name="receiving_x_file">Ricezione di %1$s file (%2$d%% completato)</string>
+  <string name="download_x_file">Scarica %s</string>
+  <string name="open_x_file">Apri %s</string>
+  <string name="sending_file">invio (%1$d%% completato)</string>
+  <string name="preparing_file">Preparazione alla trasmissione del file</string>
+  <string name="x_file_offered_for_download">%s offerto da scaricare</string>
+  <string name="cancel_transmission">Annulla trasmissione</string>
+  <string name="file_transmission_failed">trasmissione del file fallita</string>
+  <string name="file_deleted">Il file è stato eliminato</string>
+  <string name="no_application_found_to_open_file">Nessuna applicazione trovata per aprire il file</string>
+  <string name="could_not_verify_fingerprint">Impronta non verificata</string>
+  <string name="manually_verify">Verifica manuale</string>
+  <string name="are_you_sure_verify_fingerprint">Sei sicuro di voler verificare l’impronta OTR del contatto?</string>
+  <string name="pref_show_dynamic_tags">Mostra tag dinamici</string>
+  <string name="pref_show_dynamic_tags_summary">Mostra tag in sola lettura sotto i contatti</string>
+  <string name="enable_notifications">Abilita le notifiche</string>
+  <string name="conference_with">Crea conferenza con…</string>
+  <string name="no_conference_server_found">Nessun server per conferenza trovato</string>
+  <string name="conference_creation_failed">Creazione della conferenza fallita!</string>
+  <string name="conference_created">Conferenza creata!</string>
+  <string name="secret_accepted">Segreto accettato!</string>
+  <string name="reset">Reset</string>
+  <string name="account_image_description">Avatar utente</string>
+  <string name="copy_otr_clipboard_description">Copia impronta OTR</string>
+  <string name="fetching_history_from_server">Caricamento della cronologia dal server</string>
+  <string name="no_more_history_on_server">Fine cronologia sul server</string>
+  <string name="updating">Caricamento…</string>
+  <string name="password_changed">Password cambiata!</string>
+  <string name="could_not_change_password">Impossibile cambiare la password</string>
+  <string name="otr_session_not_started">Invia un messaggio per avviare una conversazione cifrata</string>
+  <string name="ask_question">Fai una domanda</string>
+  <string name="smp_explain_question">Se tu ed il tuo contatto avete un segreto in comune che nessun’altro conosce (come uno scherzo o semplicemente ciò che avete mangiato a pranzo l’ultima volta che vi siete incontrati), potete usare quel segreto per dimostrare la vostra identità reciprocamente.\n\nFornisci un suggerimento o una domanda al tuo contatto che ti risponderà con una domanda Case Sensitive.</string>
+  <string name="smp_explain_answer">Il tuo contatto vorrebbe verificare la tua identità. Dovrai rispondere correttamente alla sua domanda con una risposta che condividete. Il tuo contatto ti ha fornito il suggerimento o la domanda seguente.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Il suggerimento non dovrebbe essere vuoto</string>
+  <string name="shared_secret_can_not_be_empty">Il segreto condiviso non può essere vuoto</string>
+  <string name="manual_verification_explanation">Compara attentamente l’impronta mostrata sotto con l’impronta del tuo contatto.\nPuoi usare qualsiasi forma di comunicazione fidata come una e-mail cifrata o una chiamata telefonica per confrontare le impronte.</string>
+  <string name="change_password">Cambia password</string>
+  <string name="current_password">Password attuale</string>
+  <string name="new_password">Nuova password</string>
+  <string name="password_should_not_be_empty">La password non dovrebbe essere vuota</string>
+  <string name="enable_all_accounts">Abilita tutti gli utenti</string>
+  <string name="disable_all_accounts">Disabilita tutti gli utenti</string>
+  <string name="perform_action_with">Perform action with</string>
+  <string name="no_affiliation">No affiliazione</string>
+  <string name="no_role">Nessun ruolo</string>
+  <string name="outcast">Emarginato</string>
+  <string name="member">Membro</string>
+  <string name="advanced_mode">Modalità avanzata</string>
+  <string name="grant_membership">Concedi appartenenza</string>
+  <string name="remove_membership">Revoca appartenenza</string>
+  <string name="grant_admin_privileges">Concedi i privilegi di amministratore</string>
+  <string name="remove_admin_privileges">Revoca i privilegi di amministratore</string>
+  <string name="remove_from_room">Rimuovi dalla conferenza</string>
+  <string name="could_not_change_affiliation">Impossibile cambiare l’affiliazione di %s</string>
+  <string name="ban_from_conference">Bandisci dalla conferenza</string>
+  <string name="removing_from_public_conference">Stai cercando di rimuovere %s da una conferenza pubblica. L’unico modo per farlo è bandire per sempre quell’utente.</string>
+  <string name="ban_now">Bandisci</string>
+  <string name="could_not_change_role">Impossibile cambiare ruolo di %s</string>
+  <string name="public_conference">Conferenza pubblicamente accessibile</string>
+  <string name="private_conference">Conferenza privata</string>
+  <string name="conference_options">Opzioni conferenza</string>
+  <string name="members_only">Privata (solo membri)</string>
+  <string name="non_anonymous">Non anonimo</string>
+  <string name="modified_conference_options">Modificate le opzioni della conferenza!</string>
+  <string name="could_not_modify_conference_options">Impossibile modificare opzioni conferenza</string>
+  <string name="never">Mai</string>
+  <string name="thirty_minutes">30 minuti</string>
+  <string name="one_hour">1 ora</string>
+  <string name="two_hours">2 ore</string>
+  <string name="eight_hours">8 ore</string>
+  <string name="until_further_notice">Fino a nuovo avviso</string>
+  <string name="pref_input_options">Opzioni di ingresso</string>
+  <string name="pref_enter_is_send">Invio invia</string>
+  <string name="pref_enter_is_send_summary">Il tasto invio spedisce il messaggio</string>
+  <string name="pdf_document">Documento PDF</string>
+  <string name="received_x_file">Ricevuto %s</string>
 </resources>
diff --git a/src/main/res/values-iw/arrays.xml b/src/main/res/values-iw/arrays.xml
deleted file mode 100644
index 28768d6c..00000000
--- a/src/main/res/values-iw/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>נייד</item>
-        <item>טלפון</item>
-        <item>טאבלט</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>אף פעם</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 79fe9f3a..010da80e 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -1,223 +1,216 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">הגדרות</string>
-    <string name="action_add">דיון חדש</string>
-    <string name="action_accounts">נהל חשבונות</string>
-    <string name="action_end_conversation">סיים את דיון זה</string>
-    <string name="action_contact_details">פרטי איש קשר</string>
-    <string name="action_muc_details">פרטי ועידה</string>
-    <string name="action_secure">דיון מאובטח</string>
-    <string name="action_add_account">הוסף חשבון</string>
-    <string name="action_edit_contact">ערוך שם</string>
-    <string name="action_add_phone_book">הוסף אל פנקס טלפונים</string>
-    <string name="action_delete_contact">מחק מתוך רשימה</string>
-    <string name="title_activity_manage_accounts">נהל חשבונות</string>
-    <string name="title_activity_settings">הגדרות</string>
-    <string name="title_activity_conference_details">פרטי ועידה</string>
-    <string name="title_activity_contact_details">פרטי איש קשר</string>
-    <string name="title_activity_conversations">דיונים</string>
-    <string name="title_activity_sharewith">שתף בעזרת Conversations</string>
-    <string name="title_activity_start_conversation">התחל דיון</string>
-    <string name="title_activity_choose_contact">בחר איש קשר</string>
-    <string name="just_now">רק כעת</string>
-    <string name="minute_ago">לפני דקה 1</string>
-    <string name="minutes_ago">לפני %d דקות</string>
-    <string name="unread_conversations">דיונים שלא נקראו</string>
-    <string name="sending">כעת שולח&#8230;</string>
-    <string name="encrypted_message">כעת מפענח הודעה. אנא המתן&#8230;</string>
-    <string name="nick_in_use">שם כינוי כבר מצוי בשימוש</string>
-    <string name="admin">מנהל</string>
-    <string name="owner">בעלים</string>
-    <string name="moderator">אחראי</string>
-    <string name="participant">משתתף</string>
-    <string name="visitor">מבקר</string>
-    <string name="remove_contact_text">האם ברצונך להסיר את %s מתןך הרשימה שלך? הדיונים אשר משוייכים עם חשבון זה לא יוסרו.</string>
-    <string name="remove_bookmark_text">האם ברצונך להסיר את %s בתוור סימנייה? הדיונים אשר משוייכים עם סימנייה זו לא יוסרו.</string>
-    <string name="register_account">רשום חשבון חדש על שרת</string>
-    <string name="share_with">שתף בעזרת</string>
-    <string name="start_conversation">התחל דיון</string>
-    <string name="invite_contact">הזמן איש קשר</string>
-    <string name="contacts">אנשי קשר</string>
-    <string name="cancel">ביטול</string>
-    <string name="add">הוסף</string>
-    <string name="edit">ערוך</string>
-    <string name="delete">מחק</string>
-    <string name="save">שמור</string>
-    <string name="ok">אישור</string>
-    <string name="crash_report_title">Conversations קרסה</string>
-    <string name="crash_report_message">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations\n<b>אזהרה:</b> זו תעשה שימוש בחשבון XMPP שלך כדי לשלוח עקבות מחסנית אל המפתח.</string>
-    <string name="send_now">שלח עכשיו</string>
-    <string name="send_never">לעולם אל תשאל שוב</string>
-    <string name="problem_connecting_to_account">לא מסוגל להתחבר אל חשבון</string>
-    <string name="problem_connecting_to_accounts">לא מסוגל להתחבר אל חשבונות מרובים</string>
-    <string name="touch_to_fix">לחץ כאן כדי לנהל את החשבונות שלך</string>
-    <string name="attach_file">צרף קובץ</string>
-    <string name="not_in_roster">איש קשר אינו מצוי בתוך הרשימה שלך. האם ברצונך להוסיפו?</string>
-    <string name="add_contact">הוסף איש קשר</string>
-    <string name="send_failed">מסירה נכשלה</string>
-    <string name="send_rejected">סורב</string>
-    <string name="receiving_image">כעת מקבל קובץ תצלום. אנא המתן&#8230;</string>
-    <string name="preparing_image">כעת מכין תצלום לשם תמסורת</string>
-    <string name="action_clear_history">טהר היסטוריה</string>
-    <string name="clear_conversation_history">טהר היסטוריית דיונים</string>
-    <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בתוך דיון זה?\n\n<b>אזהרה:</b> זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
-    <string name="delete_messages">מחק הודעות</string>
-    <string name="also_end_conversation">סיים את דיון זה לאחר מכן</string>
-    <string name="choose_presence">בחר נוכחות לאיש קשר</string>
-    <string name="send_plain_text_message">שלח הודעת טקסט גלוי</string>
-    <string name="send_otr_message">שלח הודעה מוצפנת OTR</string>
-    <string name="send_pgp_message">שלח הודעה מוצפנת OpenPGP</string>
-    <string name="your_nick_has_been_changed">שם כינוי שלך השתנה</string>
-    <string name="download_image">הורד תצלום</string>
-    <string name="image_offered_for_download"><i>קובץ תצלום מוצע להורדה</i></string>
-    <string name="send_unencrypted">שלח לא מוצפנת</string>
-    <string name="decryption_failed">פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations מפיקה תועלת מן אפליקציית צד-שלישי הקרויה <b>OpenKeychain</b> כדי להצפין ולפענח הודעות וגם כדי לנהל את המפתחות הפומביים שלך.\n\nOpenKeychain הינה רשויה תחת GPLv3 וזמינה אצל F-Droid וגם Google Play.\n\n<small>(אנא התחל מחדש את Conversations לאחר מכן.)</small></string>
-    <string name="restart">התחל מחדש</string>
-    <string name="install">התקן</string>
-    <string name="offering">כעת מציע&#8230;</string>
-    <string name="waiting">כעת ממתין&#8230;</string>
-    <string name="no_pgp_key">לא נמצא מפתח OpenPGP</string>
-    <string name="contact_has_no_pgp_key">Conversations אינה מסוגלת להצפין את הודעותיך משום שאיש הקשר שלך אינו מכריז על המפתח הפומבי שלו או שלה.\n\n<small>אנא בקש מאיש הקשר שלך לארגן OpenPGP.</small></string>
-    <string name="no_pgp_keys">לא נמצאו מפתחות OpenPGP</string>
-    <string name="contacts_have_no_pgp_keys">Conversations אינה מסוגלת להצפין את הודעותיך משום שאנשי הקשר שלך אינם מכריזים על המפתח הפומבי שלהם.\n\n<small>אנא בקש מאנשי הקשר שלך לארגן OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>הודעה מוצפנת התקבלה. לחץ כדי לצפות ולפענח.</i></string>
-    <string name="encrypted_image_received"><i>תצלום מוצפן התקבל. לחץ כדי לצפות ולפענח.</i></string>
-    <string name="image_file"><i>תצלום התקבל. לחץ כדי לצפות</i></string>
-    <string name="pref_xmpp_resource">משאב XMPP</string>
-    <string name="pref_xmpp_resource_summary">השם שלקוח זה מזהה את עצמו עם</string>
-    <string name="pref_accept_files">קבל קבצים</string>
-    <string name="pref_accept_files_summary">קבל אוטומטית קבצים קטנים יותר מאשר&#8230;</string>
-    <string name="pref_notification_settings">הגדרות התראה</string>
-    <string name="pref_notifications">התראות</string>
-    <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
-    <string name="pref_vibrate">הרטט</string>
-    <string name="pref_vibrate_summary">הרטט גם כאשר הודעה חדשה מגיעה</string>
-    <string name="pref_sound">צליל</string>
-    <string name="pref_sound_summary">נגן צלצול עם התראה</string>
-    <string name="pref_conference_notifications">התראות ועידה</string>
-    <string name="pref_conference_notifications_summary">תמיד תודיע כאשר הודעת ועידה חדשה מגיעה במקום רק כאשר מודגשת</string>
-    <string name="pref_notification_grace_period">משך ארכת התראה</string>
-    <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת פחם התקבלה</string>
-    <string name="pref_advanced_options">אפשרויות מתקדמות</string>
-    <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
-    <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
-    <string name="pref_confirm_messages">אשר הודעות</string>
-    <string name="pref_confirm_messages_summary">אפשר לאיש קשר שלך לדעת מתי קיבלת וקראת הודעה</string>
-    <string name="openpgp_error">OpenKeychain דיווח שגיאה</string>
-    <string name="error_decrypting_file">שגיאת I/O פענוח קובץ</string>
-    <string name="accept">קבל</string>
-    <string name="error">אירעה שגיאה</string>
-    <string name="pref_grant_presence_updates">הענק עדכוני נוכחות</string>
-    <string name="pref_grant_presence_updates_summary">הענק ובקש הרשמות נוכחות מראש עבור אנשי קשר שיצרת</string>
-    <string name="subscriptions">הרשמות</string>
-    <string name="your_account">החשבון שלך</string>
-    <string name="keys">מפתחות</string>
-    <string name="send_presence_updates">שלח עדכוני נוכחות</string>
-    <string name="receive_presence_updates">קבל עדכוני נוכחות</string>
-    <string name="ask_for_presence_updates">בקש עדכוני נוכחות</string>
-    <string name="attach_choose_picture">בחר תמונה</string>
-    <string name="attach_take_picture">קח תמונה</string>
-    <string name="preemptively_grant">הענק בקשת הרשמה מראש</string>
-    <string name="error_not_an_image_file">הקובץ שבחרת אינו תצלום</string>
-    <string name="error_compressing_image">שגיאה במהלך המרת קובץ תצלום</string>
-    <string name="error_file_not_found">קובץ לא נמצא</string>
-    <string name="error_io_exception">שגיאת I/O כללית. אולי אזל לך נפח אחסון?</string>
-    <string name="error_security_exception_during_image_copy">האפליקציה בה השתמשת כדי לבחור את תצלום זה לא סיפקה לנו מספיק הרשאות כדי לקרוא את הקובץ.\n\n<small>השתמש במנהל קבצים אחר כדי לבחור תצלום</small></string>
-    <string name="account_status_unknown">לא ידוע</string>
-    <string name="account_status_disabled">מנוטרל זמנית</string>
-    <string name="account_status_online">מקוון</string>
-    <string name="account_status_connecting">כעת מתחבר\u2026</string>
-    <string name="account_status_offline">לא מקוון</string>
-    <string name="account_status_unauthorized">לא מורשה</string>
-    <string name="account_status_not_found">שרת לא נמצא</string>
-    <string name="account_status_no_internet">אין חיבוריות</string>
-    <string name="account_status_regis_fail">הרשמה נכשלה</string>
-    <string name="account_status_regis_conflict">שם משתמש כבר מצוי בשימוש</string>
-    <string name="account_status_regis_success">הרשמה הושלמה</string>
-    <string name="account_status_regis_not_sup">שרת לא תומך הרשמה</string>
-    <string name="encryption_choice_none">טקסט גלוי</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">ערוך חשבון</string>
-    <string name="mgmt_account_delete">מחק</string>
-    <string name="mgmt_account_disable">נטרל זמנית</string>
-    <string name="mgmt_account_publish_avatar">פרסם אווטאר</string>
-    <string name="mgmt_account_enable">אפשר</string>
-    <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
-    <string name="mgmt_account_delete_confirm_text">אם אתה מוחק את חשבונך כל היסטוריית הדיון שלך תאבד</string>
-    <string name="attach_record_voice">הקלט קול</string>
-    <string name="account_settings_jabber_id">מזהה Jabber</string>
-    <string name="account_settings_password">סיסמה</string>
-    <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">אמת סיסמה</string>
-    <string name="password">סיסמה</string>
-    <string name="confirm_password">אמת סיסמה</string>
-    <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
-    <string name="invalid_jid">זה אינו מזהה Jabber תקף</string>
-    <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
-    <string name="add_phone_book_text">האם ברצונך להוסיף את %s אל רשימת קשר טלפונית?</string>
-    <string name="contact_status_online">מקוון</string>
-    <string name="contact_status_free_to_chat">חופשי לשיחה</string>
-    <string name="contact_status_away">נעדר</string>
-    <string name="contact_status_extended_away">נעדר לזמן מה</string>
-    <string name="contact_status_do_not_disturb">אל תפריעו</string>
-    <string name="contact_status_offline">לא מקוון</string>
-    <string name="muc_details_conference">ועידה</string>
-    <string name="muc_details_other_members">חברים אחרים</string>
-    <string name="server_info_carbon_messages">הודעות פחם</string>
-    <string name="server_info_stream_management">ניהול זרם</string>
-    <string name="missing_public_keys">הכרזות מפתח פומבי חסרות</string>
-    <string name="last_seen_now">נראה לאחרונה ממש עכשיו</string>
-    <string name="last_seen_min">נראה לאחרונה לפני דקה 1</string>
-    <string name="last_seen_mins">נראה לאחרונה לפני %d דקות</string>
-    <string name="last_seen_hour">נראה לאחרונה לפני שעה 1</string>
-    <string name="last_seen_hours">נראה לאחרונה לפני %d שעות ago</string>
-    <string name="last_seen_day">נראה לאחרונה לפני יום 1</string>
-    <string name="last_seen_days">נראה לאחרונה לפני %d ימים</string>
-    <string name="never_seen">לא נראה מעולם</string>
-    <string name="install_openkeychain">הודעה מוצפנת. אנא התקן OpenKeychain כדי לפענח.</string>
-    <string name="unknown_otr_fingerprint">טביעת אצבע OTR לא מוכרת</string>
-    <string name="openpgp_messages_found">הודעות מוצפנות OpenPGP נמצאו</string>
-    <string name="reception_failed">קבלה נכשלה</string>
-    <string name="your_fingerprint">טביעת אצבע שלך</string>
-    <string name="otr_fingerprint">טביעת אצבע OTR</string>
-    <string name="verify">אמת</string>
-    <string name="decrypt">פענח</string>
-    <string name="conferences">ועידות</string>
-    <string name="search">חפש</string>
-    <string name="create_contact">צור איש קשר</string>
-    <string name="join_conference">הצטרף לועידה</string>
-    <string name="delete_contact">מחק איש קשר</string>
-    <string name="view_contact_details">צפה בפרטי איש קשר</string>
-    <string name="create">צור</string>
-    <string name="contact_already_exists">איש קשר כבר קיים</string>
-    <string name="join">הצטרף</string>
-    <string name="conference_address">כתובת ועידה</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">שמור בתור סימנייה</string>
-    <string name="delete_bookmark">מחק סימנייה</string>
-    <string name="bookmark_already_exists">סימנייה זו כבר קיימת</string>
-    <string name="you">אני</string>
-    <string name="action_edit_subject">ערוך נושא ועידה</string>
-    <string name="conference_not_found">ועידה לא נמצאה</string>
-    <string name="leave">עזוב</string>
-    <string name="contact_added_you">איש קשר הוסיף אותך אל רשימת קשר</string>
-    <string name="add_back">הוסף בחזרה</string>
-    <string name="contact_has_read_up_to_this_point">%s קרא עד לנקודה זו</string>
-    <string name="touch_to_choose_picture">לחץ על אווטאר כדי לבחור תמונה מתוך גלריה</string>
-    <string name="publish_avatar_explanation">לתשומת לבך: כל מי אשר רשום לעדכוני נוכחות שלך יורשה לראות את תמונה זו.</string>
-    <string name="publishing">כעת מפרסם&#8230;</string>
-    <string name="error_publish_avatar_server_reject">השרת פסל פרסום</string>
-    <string name="error_publish_avatar_converting">משהו השתבש במהלך המרת תמונה</string>
-    <string name="error_saving_avatar">לא היה מסוגל לשמור אווטאר אל כונן</string>
-    <string name="or_long_press_for_default">(או לחיצה ארוכה כדי להחזיר לשגרה)</string>
-    <string name="error_publish_avatar_no_server_support">שרתך לא תומך בפרסום של אווטארים</string>
-    <string name="private_message">בפרטי</string>
-    <string name="private_message_to">בפרטי אל %s</string>
-    <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
-    <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
-
+  <string name="action_settings">הגדרות</string>
+  <string name="action_add">דיון חדש</string>
+  <string name="action_accounts">נהל חשבונות</string>
+  <string name="action_end_conversation">סיים את דיון זה</string>
+  <string name="action_contact_details">פרטי איש קשר</string>
+  <string name="action_muc_details">פרטי ועידה</string>
+  <string name="action_secure">דיון מאובטח</string>
+  <string name="action_add_account">הוסף חשבון</string>
+  <string name="action_edit_contact">ערוך שם</string>
+  <string name="action_add_phone_book">הוסף אל פנקס טלפונים</string>
+  <string name="action_delete_contact">מחק מתוך רשימה</string>
+  <string name="title_activity_manage_accounts">נהל חשבונות</string>
+  <string name="title_activity_settings">הגדרות</string>
+  <string name="title_activity_conference_details">פרטי ועידה</string>
+  <string name="title_activity_contact_details">פרטי איש קשר</string>
+  <string name="title_activity_sharewith">שתף בעזרת Conversations</string>
+  <string name="title_activity_start_conversation">התחל דיון</string>
+  <string name="title_activity_choose_contact">בחר איש קשר</string>
+  <string name="just_now">רק כעת</string>
+  <string name="minute_ago">לפני דקה 1</string>
+  <string name="minutes_ago">לפני %d דקות</string>
+  <string name="unread_conversations">דיונים שלא נקראו</string>
+  <string name="sending">כעת שולח…</string>
+  <string name="encrypted_message">כעת מפענח הודעה. אנא המתן…</string>
+  <string name="nick_in_use">שם כינוי כבר מצוי בשימוש</string>
+  <string name="admin">מנהל</string>
+  <string name="owner">בעלים</string>
+  <string name="moderator">אחראי</string>
+  <string name="participant">משתתף</string>
+  <string name="visitor">מבקר</string>
+  <string name="remove_contact_text">האם ברצונך להסיר את %s מתןך הרשימה שלך? הדיונים אשר משוייכים עם חשבון זה לא יוסרו.</string>
+  <string name="remove_bookmark_text">האם ברצונך להסיר את %s בתוור סימנייה? הדיונים אשר משוייכים עם סימנייה זו לא יוסרו.</string>
+  <string name="register_account">רשום חשבון חדש על שרת</string>
+  <string name="share_with">שתף בעזרת</string>
+  <string name="start_conversation">התחל דיון</string>
+  <string name="invite_contact">הזמן איש קשר</string>
+  <string name="contacts">אנשי קשר</string>
+  <string name="cancel">ביטול</string>
+  <string name="add">הוסף</string>
+  <string name="edit">ערוך</string>
+  <string name="delete">מחק</string>
+  <string name="save">שמור</string>
+  <string name="ok">אישור</string>
+  <string name="crash_report_title">Conversations קרסה</string>
+  <string name="crash_report_message">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations\n<b>אזהרה:</b> זו תעשה שימוש בחשבון XMPP שלך כדי לשלוח עקבות מחסנית אל המפתח.</string>
+  <string name="send_now">שלח עכשיו</string>
+  <string name="send_never">לעולם אל תשאל שוב</string>
+  <string name="problem_connecting_to_account">לא מסוגל להתחבר אל חשבון</string>
+  <string name="problem_connecting_to_accounts">לא מסוגל להתחבר אל חשבונות מרובים</string>
+  <string name="touch_to_fix">לחץ כאן כדי לנהל את החשבונות שלך</string>
+  <string name="attach_file">צרף קובץ</string>
+  <string name="not_in_roster">איש קשר אינו מצוי בתוך הרשימה שלך. האם ברצונך להוסיפו?</string>
+  <string name="add_contact">הוסף איש קשר</string>
+  <string name="send_failed">מסירה נכשלה</string>
+  <string name="send_rejected">סורב</string>
+  <string name="preparing_image">כעת מכין תצלום לשם תמסורת</string>
+  <string name="action_clear_history">טהר היסטוריה</string>
+  <string name="clear_conversation_history">טהר היסטוריית דיונים</string>
+  <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בתוך דיון זה?\n\n<b>אזהרה:</b> זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
+  <string name="delete_messages">מחק הודעות</string>
+  <string name="also_end_conversation">סיים את דיון זה לאחר מכן</string>
+  <string name="choose_presence">בחר נוכחות לאיש קשר</string>
+  <string name="send_plain_text_message">שלח הודעת טקסט גלוי</string>
+  <string name="send_otr_message">שלח הודעה מוצפנת OTR</string>
+  <string name="send_pgp_message">שלח הודעה מוצפנת OpenPGP</string>
+  <string name="your_nick_has_been_changed">שם כינוי שלך השתנה</string>
+  <string name="download_image">הורד תצלום</string>
+  <string name="send_unencrypted">שלח לא מוצפנת</string>
+  <string name="decryption_failed">פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations מפיקה תועלת מן אפליקציית צד-שלישי הקרויה <b>OpenKeychain</b> כדי להצפין ולפענח הודעות וגם כדי לנהל את המפתחות הפומביים שלך.\n\nOpenKeychain הינה רשויה תחת GPLv3 וזמינה אצל F-Droid וגם Google Play.\n\n<small>(אנא התחל מחדש את Conversations לאחר מכן.)</small></string>
+  <string name="restart">התחל מחדש</string>
+  <string name="install">התקן</string>
+  <string name="offering">כעת מציע…</string>
+  <string name="waiting">כעת ממתין…</string>
+  <string name="no_pgp_key">לא נמצא מפתח OpenPGP</string>
+  <string name="contact_has_no_pgp_key">Conversations אינה מסוגלת להצפין את הודעותיך משום שאיש הקשר שלך אינו מכריז על המפתח הפומבי שלו או שלה.\n\n<small>אנא בקש מאיש הקשר שלך לארגן OpenPGP.</small></string>
+  <string name="no_pgp_keys">לא נמצאו מפתחות OpenPGP</string>
+  <string name="contacts_have_no_pgp_keys">Conversations אינה מסוגלת להצפין את הודעותיך משום שאנשי הקשר שלך אינם מכריזים על המפתח הפומבי שלהם.\n\n<small>אנא בקש מאנשי הקשר שלך לארגן OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>הודעה מוצפנת התקבלה. לחץ כדי לצפות ולפענח.</i></string>
+  <string name="pref_xmpp_resource">משאב XMPP</string>
+  <string name="pref_xmpp_resource_summary">השם שלקוח זה מזהה את עצמו עם</string>
+  <string name="pref_accept_files">קבל קבצים</string>
+  <string name="pref_accept_files_summary">קבל אוטומטית קבצים קטנים יותר מאשר…</string>
+  <string name="pref_notification_settings">הגדרות התראה</string>
+  <string name="pref_notifications">התראות</string>
+  <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
+  <string name="pref_vibrate">הרטט</string>
+  <string name="pref_vibrate_summary">הרטט גם כאשר הודעה חדשה מגיעה</string>
+  <string name="pref_sound">צליל</string>
+  <string name="pref_sound_summary">נגן צלצול עם התראה</string>
+  <string name="pref_conference_notifications">התראות ועידה</string>
+  <string name="pref_conference_notifications_summary">תמיד תודיע כאשר הודעת ועידה חדשה מגיעה במקום רק כאשר מודגשת</string>
+  <string name="pref_notification_grace_period">משך ארכת התראה</string>
+  <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת פחם התקבלה</string>
+  <string name="pref_advanced_options">אפשרויות מתקדמות</string>
+  <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
+  <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
+  <string name="pref_confirm_messages">אשר הודעות</string>
+  <string name="pref_confirm_messages_summary">אפשר לאיש קשר שלך לדעת מתי קיבלת וקראת הודעה</string>
+  <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
+  <string name="openpgp_error">OpenKeychain דיווח שגיאה</string>
+  <string name="error_decrypting_file">שגיאת I/O פענוח קובץ</string>
+  <string name="accept">קבל</string>
+  <string name="error">אירעה שגיאה</string>
+  <string name="pref_grant_presence_updates">הענק עדכוני נוכחות</string>
+  <string name="pref_grant_presence_updates_summary">הענק ובקש הרשמות נוכחות מראש עבור אנשי קשר שיצרת</string>
+  <string name="subscriptions">הרשמות</string>
+  <string name="your_account">החשבון שלך</string>
+  <string name="keys">מפתחות</string>
+  <string name="send_presence_updates">שלח עדכוני נוכחות</string>
+  <string name="receive_presence_updates">קבל עדכוני נוכחות</string>
+  <string name="ask_for_presence_updates">בקש עדכוני נוכחות</string>
+  <string name="attach_choose_picture">בחר תמונה</string>
+  <string name="attach_take_picture">קח תמונה</string>
+  <string name="preemptively_grant">הענק בקשת הרשמה מראש</string>
+  <string name="error_not_an_image_file">הקובץ שבחרת אינו תצלום</string>
+  <string name="error_compressing_image">שגיאה במהלך המרת קובץ תצלום</string>
+  <string name="error_file_not_found">קובץ לא נמצא</string>
+  <string name="error_io_exception">שגיאת I/O כללית. אולי אזל לך נפח אחסון?</string>
+  <string name="error_security_exception_during_image_copy">האפליקציה בה השתמשת כדי לבחור את תצלום זה לא סיפקה לנו מספיק הרשאות כדי לקרוא את הקובץ.\n\n<small>השתמש במנהל קבצים אחר כדי לבחור תצלום</small></string>
+  <string name="account_status_unknown">לא ידוע</string>
+  <string name="account_status_disabled">מנוטרל זמנית</string>
+  <string name="account_status_online">מקוון</string>
+  <string name="account_status_connecting">כעת מתחבר\u2026</string>
+  <string name="account_status_offline">לא מקוון</string>
+  <string name="account_status_unauthorized">לא מורשה</string>
+  <string name="account_status_not_found">שרת לא נמצא</string>
+  <string name="account_status_no_internet">אין חיבוריות</string>
+  <string name="account_status_regis_fail">הרשמה נכשלה</string>
+  <string name="account_status_regis_conflict">שם משתמש כבר מצוי בשימוש</string>
+  <string name="account_status_regis_success">הרשמה הושלמה</string>
+  <string name="account_status_regis_not_sup">שרת לא תומך הרשמה</string>
+  <string name="encryption_choice_none">טקסט גלוי</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">ערוך חשבון</string>
+  <string name="mgmt_account_delete">מחק</string>
+  <string name="mgmt_account_disable">נטרל זמנית</string>
+  <string name="mgmt_account_publish_avatar">פרסם אווטאר</string>
+  <string name="mgmt_account_enable">אפשר</string>
+  <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
+  <string name="mgmt_account_delete_confirm_text">אם אתה מוחק את חשבונך כל היסטוריית הדיון שלך תאבד</string>
+  <string name="attach_record_voice">הקלט קול</string>
+  <string name="account_settings_jabber_id">מזהה Jabber</string>
+  <string name="account_settings_password">סיסמה</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">אמת סיסמה</string>
+  <string name="password">סיסמה</string>
+  <string name="confirm_password">אמת סיסמה</string>
+  <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
+  <string name="invalid_jid">זה אינו מזהה Jabber תקף</string>
+  <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
+  <string name="add_phone_book_text">האם ברצונך להוסיף את %s אל רשימת קשר טלפונית?</string>
+  <string name="contact_status_online">מקוון</string>
+  <string name="contact_status_free_to_chat">חופשי לשיחה</string>
+  <string name="contact_status_away">נעדר</string>
+  <string name="contact_status_extended_away">נעדר לזמן מה</string>
+  <string name="contact_status_do_not_disturb">אל תפריעו</string>
+  <string name="contact_status_offline">לא מקוון</string>
+  <string name="muc_details_conference">ועידה</string>
+  <string name="muc_details_other_members">חברים אחרים</string>
+  <string name="server_info_carbon_messages">הודעות פחם</string>
+  <string name="server_info_stream_management">ניהול זרם</string>
+  <string name="missing_public_keys">הכרזות מפתח פומבי חסרות</string>
+  <string name="last_seen_now">נראה לאחרונה ממש עכשיו</string>
+  <string name="last_seen_min">נראה לאחרונה לפני דקה 1</string>
+  <string name="last_seen_mins">נראה לאחרונה לפני %d דקות</string>
+  <string name="last_seen_hour">נראה לאחרונה לפני שעה 1</string>
+  <string name="last_seen_hours">נראה לאחרונה לפני %d שעות ago</string>
+  <string name="last_seen_day">נראה לאחרונה לפני יום 1</string>
+  <string name="last_seen_days">נראה לאחרונה לפני %d ימים</string>
+  <string name="never_seen">לא נראה מעולם</string>
+  <string name="install_openkeychain">הודעה מוצפנת. אנא התקן OpenKeychain כדי לפענח.</string>
+  <string name="unknown_otr_fingerprint">טביעת אצבע OTR לא מוכרת</string>
+  <string name="openpgp_messages_found">הודעות מוצפנות OpenPGP נמצאו</string>
+  <string name="reception_failed">קבלה נכשלה</string>
+  <string name="your_fingerprint">טביעת אצבע שלך</string>
+  <string name="otr_fingerprint">טביעת אצבע OTR</string>
+  <string name="verify">אמת</string>
+  <string name="decrypt">פענח</string>
+  <string name="conferences">ועידות</string>
+  <string name="search">חפש</string>
+  <string name="create_contact">צור איש קשר</string>
+  <string name="join_conference">הצטרף לועידה</string>
+  <string name="delete_contact">מחק איש קשר</string>
+  <string name="view_contact_details">צפה בפרטי איש קשר</string>
+  <string name="create">צור</string>
+  <string name="contact_already_exists">איש קשר כבר קיים</string>
+  <string name="join">הצטרף</string>
+  <string name="conference_address">כתובת ועידה</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">שמור בתור סימנייה</string>
+  <string name="delete_bookmark">מחק סימנייה</string>
+  <string name="bookmark_already_exists">סימנייה זו כבר קיימת</string>
+  <string name="you">אני</string>
+  <string name="action_edit_subject">ערוך נושא ועידה</string>
+  <string name="conference_not_found">ועידה לא נמצאה</string>
+  <string name="leave">עזוב</string>
+  <string name="contact_added_you">איש קשר הוסיף אותך אל רשימת קשר</string>
+  <string name="add_back">הוסף בחזרה</string>
+  <string name="contact_has_read_up_to_this_point">%s קרא עד לנקודה זו</string>
+  <string name="touch_to_choose_picture">לחץ על אווטאר כדי לבחור תמונה מתוך גלריה</string>
+  <string name="publish_avatar_explanation">לתשומת לבך: כל מי אשר רשום לעדכוני נוכחות שלך יורשה לראות את תמונה זו.</string>
+  <string name="publishing">כעת מפרסם…</string>
+  <string name="error_publish_avatar_server_reject">השרת פסל פרסום</string>
+  <string name="error_publish_avatar_converting">משהו השתבש במהלך המרת תמונה</string>
+  <string name="error_saving_avatar">לא היה מסוגל לשמור אווטאר אל כונן</string>
+  <string name="or_long_press_for_default">(או לחיצה ארוכה כדי להחזיר לשגרה)</string>
+  <string name="error_publish_avatar_no_server_support">שרתך לא תומך בפרסום של אווטארים</string>
+  <string name="private_message">בפרטי</string>
+  <string name="private_message_to">בפרטי אל %s</string>
+  <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
 </resources>
diff --git a/src/main/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml
deleted file mode 100644
index e5ae27e7..00000000
--- a/src/main/res/values-nl/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mobiel</item>
-        <item>Telefoon</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>nooit</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minuten</item>
-        <item>1 uur</item>
-        <item>2 uur</item>
-        <item>8 uur</item>
-        <item>voor onbepaalde duur</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index cb47ae97..011b018f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1,371 +1,420 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Instellingen</string>
-    <string name="action_add">Nieuw gesprek</string>
-    <string name="action_accounts">Beheer account</string>
-    <string name="action_end_conversation">Beëindig gesprek</string>
-    <string name="action_contact_details">Contactgegevens</string>
-    <string name="action_muc_details">Gespreksgegevens</string>
-    <string name="action_secure">Beveiligd gesprek</string>
-    <string name="action_add_account">Voeg account toe</string>
-    <string name="action_edit_contact">Verander naam</string>
-    <string name="action_add_phone_book">Voeg toe aan telefoonboek</string>
-    <string name="action_delete_contact">Verwijder uit lijst</string>
-    <string name="action_block_contact">Blokkeer contact</string>
-    <string name="action_unblock_contact">Deblokkeer contact</string>
-    <string name="action_block_domain">Blokkeer domein</string>
-    <string name="action_unblock_domain">Deblokkeer domein</string>
-    <string name="title_activity_manage_accounts">Beheer accounts</string>
-    <string name="title_activity_settings">Instellingen</string>
-    <string name="title_activity_conference_details">Groepsgespreksgegevens</string>
-    <string name="title_activity_contact_details">Contactgegevens</string>
-    <string name="title_activity_conversations">Gesprekken</string>
-    <string name="title_activity_sharewith">Delen met gesprek</string>
-    <string name="title_activity_start_conversation">Start gesprek</string>
-    <string name="title_activity_choose_contact">Kies contact</string>
-    <string name="title_activity_block_list">Geblokkeerde contacten</string>
-    <string name="just_now">net</string>
-    <string name="minute_ago">1 min. geleden</string>
-    <string name="minutes_ago">%d min. geleden</string>
-    <string name="unread_conversations">ongelezen gesprekken</string>
-    <string name="sending">versturen&#8230;</string>
-    <string name="encrypted_message">Bericht aan het ontsleutelen. Even geduld…</string>
-    <string name="nick_in_use">Naam is al in gebruik</string>
-    <string name="admin">Beheerder</string>
-    <string name="owner">Eigenaar</string>
-    <string name="moderator">Moderator</string>
-    <string name="participant">Deelnemer</string>
-    <string name="visitor">Bezoeker</string>
-    <string name="remove_contact_text">Wil je %s uit je lijst verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string>
-    <string name="block_contact_text">Wil je alle berichten van %s blokkeren?</string>
-    <string name="unblock_contact_text">Wil je %s deblokkeren en er weer berichten van kunnen ontvangen?</string>
-    <string name="block_domain_text">Alle contacten van %s blokkeren?</string>
-    <string name="unblock_domain_text">Alle contacten van %s deblokkeren?</string>
-    <string name="contact_blocked">Contact geblokkeerd</string>
-    <string name="remove_bookmark_text">Wil je %s als bladwijzer verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string>
-    <string name="register_account">Registreer nieuwe account op server</string>
-    <string name="change_password_on_server">Verander wachtwoord op server</string>
-    <string name="share_with">Deel met</string>
-    <string name="start_conversation">Start gesprek</string>
-    <string name="invite_contact">Nodig contact uit</string>
-    <string name="contacts">Contacten</string>
-    <string name="cancel">Annuleer</string>
-    <string name="set">Stel in</string>
-    <string name="add">Voeg toe</string>
-    <string name="edit">Bewerk</string>
-    <string name="delete">Verwijder</string>
-    <string name="block">Blokkeer</string>
-    <string name="unblock">Deblokkeer</string>
-    <string name="save">Sla op</string>
-    <string name="ok">OK</string>
-    <string name="crash_report_title">Conversations is gecrasht</string>
-    <string name="crash_report_message">Door het versturen van crash rapportages help je de ontwikkeling van Conversations.\n\n<b>Waarschuwing:</b> Deze app zal je XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string>
-    <string name="send_now">Nu versturen</string>
-    <string name="send_never">Niet opnieuw vragen</string>
-    <string name="problem_connecting_to_account">Account verbinden mislukt</string>
-    <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string>
-    <string name="touch_to_fix">Raak hier aan om accounts te beheren</string>
-    <string name="attach_file">Voeg bestand bij</string>
-    <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wil je het toevoegen?</string>
-    <string name="add_contact">Voeg contact toe</string>
-    <string name="send_failed">afleveren mislukt</string>
-    <string name="send_rejected">geweigerd</string>
-    <string name="receiving_image">Bezig met ontvangen van afbeelding. Even geduld…</string>
-    <string name="preparing_image">Bezig met voorbereiden van versturen van afbeelding</string>
-    <string name="action_clear_history">Wis geschiedenis</string>
-    <string name="clear_conversation_history">Wis gespreksgeschiedenis</string>
-    <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
-    <string name="delete_messages">Verwijder berichten</string>
-    <string name="also_end_conversation">Beëindig dit gesprek na afloop</string>
-    <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
-    <string name="send_plain_text_message">Verstuur eenvoudig tekst bericht</string>
-    <string name="send_otr_message">Verstuur OTR versleuteld bericht</string>
-    <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string>
-    <string name="your_nick_has_been_changed">Je naam is veranderd</string>
-    <string name="download_image">Download afbeelding</string>
-    <string name="image_offered_for_download"><i>Afbeelding aangeboden voor downloaden</i></string>
-    <string name="send_unencrypted">Verstuur onversleuteld</string>
-    <string name="decryption_failed">Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversations na installatie.)</small></string>
-    <string name="restart">Herstart</string>
-    <string name="install">Installeer</string>
-    <string name="offering">offering…</string>
-    <string name="waiting">wachten…</string>
-    <string name="no_pgp_key">Geen OpenPGP sleutel gevonden</string>
-    <string name="contact_has_no_pgp_key">Conversations kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string>
-    <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string>
-    <string name="contacts_have_no_pgp_keys">Conversations kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string>
-    <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
-    <string name="encrypted_image_received"><i>Versleutelde afbeelding ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
-    <string name="image_file"><i>Afbeelding ontvangen. Raak aan om te bekijken.</i></string>
-    <string name="pref_general">Algemeen</string>
-    <string name="pref_xmpp_resource">XMPP resource</string>
-    <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string>
-    <string name="pref_accept_files">Accepteer bestanden</string>
-    <string name="pref_accept_files_summary">Accepteer automatisch bestanden kleiner dan…</string>
-    <string name="pref_notification_settings">Meldingsinstellingen</string>
-    <string name="pref_notifications">Meldingen</string>
-    <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string>
-    <string name="pref_vibrate">Trillen</string>
-    <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string>
-    <string name="pref_sound">Geluid</string>
-    <string name="pref_sound_summary">Speel ringtone af bij melding</string>
-    <string name="pref_conference_notifications">Groepsgespreksmeldingen</string>
-    <string name="pref_conference_notifications_summary">Toon altijd meldingen als er nieuwe berichten arriveren in groepsgesprekken in plaats van alleen wanneer gemarkeerd</string>
-    <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
-    <string name="pref_notification_grace_period_summary">Zet meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
-    <string name="pref_advanced_options">Geavanceerde instellingen</string>
-    <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string>
-    <string name="pref_never_send_crash_summary">Door crash rapportages te versturen help je de ontwikkeling van Conversations</string>
-    <string name="pref_confirm_messages">Bevestig berichten</string>
-    <string name="pref_confirm_messages_summary">Laat je contacten weten wanneer je berichten hebt ontvangen en gelezen</string>
-    <string name="pref_ui_options">UI opties</string>
-    <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
-    <string name="error_decrypting_file">I/O fout tijdens ontsleutelen bestand</string>
-    <string name="accept">Aanvaard</string>
-    <string name="error">Er is een fout opgetreden</string>
-    <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheidsupdates</string>
-    <string name="pref_grant_presence_updates_summary">Op voorhand toestemming verlenen en vragen aan contacten die je hebt aangemaakt</string>
-    <string name="subscriptions">Abonnementen</string>
-    <string name="your_account">Je account</string>
-    <string name="keys">Sleutels</string>
-    <string name="send_presence_updates">Verstuur aanwezigheidsupdates</string>
-    <string name="receive_presence_updates">Ontvang aanwezigheidsupdates</string>
-    <string name="ask_for_presence_updates">Vraag naar aanwezigheidsupdates</string>
-    <string name="attach_choose_picture">Kies afbeelding</string>
-    <string name="attach_take_picture">Neem foto</string>
-    <string name="preemptively_grant">Op voorhand toestemming verlenen voor abonneren</string>
-    <string name="error_not_an_image_file">Het bestand dat je gekozen hebt is geen afbeelding</string>
-    <string name="error_compressing_image">Fout tijdens converteren van afbeelding</string>
-    <string name="error_file_not_found">Bestand niet gevonden</string>
-    <string name="error_io_exception">Algemene I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string>
-    <string name="error_security_exception_during_image_copy">De app die je gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string>
-    <string name="account_status_unknown">Onbekend</string>
-    <string name="account_status_disabled">Tijdelijk uitgezet</string>
-    <string name="account_status_online">Online</string>
-    <string name="account_status_connecting">Verbinden\u2026</string>
-    <string name="account_status_offline">Offline</string>
-    <string name="account_status_unauthorized">Niet gemachtigd</string>
-    <string name="account_status_not_found">Server niet gevonden</string>
-    <string name="account_status_no_internet">Geen verbinding</string>
-    <string name="account_status_regis_fail">Registratie mislukt</string>
-    <string name="account_status_regis_conflict">Gebruikersnaam bezet</string>
-    <string name="account_status_regis_success">Registratie compleet</string>
-    <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
-    <string name="account_status_security_error">Fout bij beveiliging</string>
-    <string name="account_status_incompatible_server">Incompatibele server</string>
-    <string name="encryption_choice_none">Onversleuteld</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Bewerk account</string>
-    <string name="mgmt_account_delete">Verwijder</string>
-    <string name="mgmt_account_disable">Tijdelijk uitzetten</string>
-    <string name="mgmt_account_publish_avatar">Publish avatar</string>
-    <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
-    <string name="mgmt_account_enable">Aanzetten</string>
-    <string name="mgmt_account_are_you_sure">Ben je zeker?</string>
-    <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert wordt je volledige gespreksgeschiedenis gewist</string>
-    <string name="attach_record_voice">Neem stem op</string>
-    <string name="account_settings_jabber_id">Jabber ID:</string>
-    <string name="account_settings_password">Wachtwoord:</string>
-    <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
-    <string name="account_settings_confirm_password">Bevestig wachtwoord:</string>
-    <string name="password">Wachtwoord</string>
-    <string name="confirm_password">Bevestig wachtwoord</string>
-    <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
-    <string name="invalid_jid">Dit is geen geldig Jabber ID</string>
-    <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
-    <string name="add_phone_book_text">Wil je %s toevoegen aan de contactenlijst op je telefoon?</string>
-    <string name="contact_status_online">online</string>
-    <string name="contact_status_free_to_chat">beschikbaar</string>
-    <string name="contact_status_away">weg</string>
-    <string name="contact_status_extended_away">langdurig weg</string>
-    <string name="contact_status_do_not_disturb">niet storen</string>
-    <string name="contact_status_offline">offline</string>
-    <string name="muc_details_conference">Groepsgesprek</string>
-    <string name="muc_details_other_members">Andere leden</string>
-    <string name="server_info_show_more">Server info</string>
-    <string name="server_info_mam">XEP-0313: MAM</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_csi">XEP-0352: Client State Indication</string>
-    <string name="server_info_blocking">XEP-0191: Blocking Command</string>
-    <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">beschikbaar</string>
-    <string name="server_info_unavailable">niet beschikbaar</string>
-    <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string>
-    <string name="last_seen_now">zonet voor het laatst gezien</string>
-    <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string>
-    <string name="last_seen_mins">%d minuten geleden voor het laatst gezien</string>
-    <string name="last_seen_hour">1 uur geleden voor het laatst gezien</string>
-    <string name="last_seen_hours">%d uur geleden voor het laatst gezien</string>
-    <string name="last_seen_day">1 dag geleden voor het laatst gezien</string>
-    <string name="last_seen_days">%d dagen geleden voor het laatst gezien</string>
-    <string name="never_seen">nog nooit gezien</string>
-    <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string>
-    <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
-    <string name="openpgp_messages_found">OpenPGP-versleutelde berichten gevonden</string>
-    <string name="reception_failed">Ontvangen mislukt</string>
-    <string name="your_fingerprint">Jouw vingerafdruk</string>
-    <string name="otr_fingerprint">OTR vingerafdruk</string>
-    <string name="verify">Bevestig</string>
-    <string name="decrypt">Ontsleutel</string>
-    <string name="conferences">Groepsgesprekken</string>
-    <string name="search">Zoeken</string>
-    <string name="create_contact">Maak contact aan</string>
-    <string name="join_conference">Aan groepsgesprek deelnemen</string>
-    <string name="delete_contact">Verwijder contact</string>
-    <string name="view_contact_details">Bekijk contactgegevens</string>
-    <string name="block_contact">Blokkeer contact</string>
-    <string name="unblock_contact">Deblokkeer contact</string>
-    <string name="create">Aanmaken</string>
-    <string name="contact_already_exists">Het contact bestaat al</string>
-    <string name="join">Deelnemen</string>
-    <string name="conference_address">Gespreksadres</string>
-    <string name="conference_address_example">kamer@groepsgesprek.voorbeeld.be</string>
-    <string name="save_as_bookmark">Opslaan als bladwijzer</string>
-    <string name="delete_bookmark">Bladwijzer verwijderen</string>
-    <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
-    <string name="you">Jij</string>
-    <string name="action_edit_subject">Onderwerp groepsgesprek bewerken</string>
-    <string name="conference_not_found">Groepsgesprek niet gevonden</string>
-    <string name="leave">Verlaten</string>
-    <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
-    <string name="add_back">Contact toevoegen aan eigen contacten</string>
-    <string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string>
-    <string name="publish">Publiceer</string>
-    <string name="touch_to_choose_picture">Raak avatar aan om een foto uit de galerij te kiezen</string>
-    <string name="publish_avatar_explanation"><b>Aandacht:</b> Iedereen die je aanwezigheidsupdates ontvangt zal deze foto kunnen zien.</string>
-    <string name="publishing">Publiceren…</string>
-    <string name="error_publish_avatar_server_reject">De server weigerde de publicatie van je afbeelding</string>
-    <string name="error_publish_avatar_converting">Fout bij converteren van afbeelding</string>
-    <string name="error_saving_avatar">Fout bij opslaan van avatar</string>
-    <string name="or_long_press_for_default">(Of hou lang ingedrukt om de oorspronkelijke terug te zetten)</string>
-    <string name="error_publish_avatar_no_server_support">Je server ondersteunt de publicatie van avatars niet</string>
-    <string name="private_message">gefluisterd</string>
-    <string name="private_message_to">naar %s</string>
-    <string name="send_private_message_to">Stuur privébericht naar %s</string>
-    <string name="connect">Verbinden</string>
-    <string name="account_already_exists">Deze account bestaat al</string>
-    <string name="next">Volgende</string>
-    <string name="server_info_session_established">Huidige sessie gevestigd</string>
-    <string name="additional_information">Bijkomstige informatie</string>
-    <string name="skip">Overslaan</string>
-    <string name="disable_notifications">Meldingen uitzetten</string>
-    <string name="disable_notifications_for_this_conversation">Meldingen uitzetten voor dit gesprek</string>
-    <string name="notifications_disabled">Meldingen zijn uitgezet</string>
-    <string name="enable">Aanzetten</string>
-    <string name="conference_requires_password">Wachtwoord nodig voor toegang tot groepsgesprek</string>
-    <string name="enter_password">Wachtwoord:</string>
-    <string name="missing_presence_updates">Ontbrekende aanwezigheidsupdates van contact</string>
-    <string name="request_presence_updates">Vraag eerst aanwezigheidsupdates van je contact aan.\n\n<small>Dit wordt gebruikt om te bepalen welke client(s) je contact gebruikt.</small></string>
-    <string name="request_now">Nu aanvragen</string>
-    <string name="delete_fingerprint">Vingerafdruk verwijderen</string>
-    <string name="sure_delete_fingerprint">Ben je zeker dat je deze vingerafdruk wil verwijderen?</string>
-    <string name="ignore">Negeren</string>
-    <string name="without_mutual_presence_updates"><b>Waarschuwing:</b> Dit verzenden zonder wederzijdse aanwezigheidsupdates kan voor onverwachte problemen zorgen.\n\n<small>Ga naar contactgegevens om je aanwezigheidsupdates te bevestigen.</small></string>
-    <string name="pref_encryption_settings">Versleutelingsinstellingen</string>
-    <string name="pref_force_encryption">Verplicht end-to-end versleuteling</string>
-    <string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string>
-    <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
-    <string name="pref_dont_save_encrypted_summary"><b>Waarschuwing:</b> Dit kan leiden tot verlies van berichten</string>
-    <string name="pref_enable_legacy_ssl">Sta legacy SSL toe</string>
-    <string name="pref_enable_legacy_ssl_summary">Staat ondersteuning voor SSLv3 voor legacy servers toe. <b>Waarschuwing:</b> SSLv3 is niet veilig.</string>
-    <string name="pref_expert_options">Expert-instellingen</string>
-    <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
-    <string name="title_activity_about">Over Conversations</string>
-    <string name="pref_about_conversations_summary">Build en licentie-informatie</string>
-    <string name="title_pref_quiet_hours">Stille uren</string>
-    <string name="title_pref_quiet_hours_start_time">Begintijd</string>
-    <string name="title_pref_quiet_hours_end_time">Eindtijd</string>
-    <string name="title_pref_enable_quiet_hours">Stille uren aanzetten</string>
-    <string name="pref_quiet_hours_summary">Tijdens stille uren worden meldingen onderdrukt</string>
-    <string name="pref_use_larger_font">Vergroot lettergrootte</string>
-    <string name="pref_use_larger_font_summary">Gebruik grotere lettertypes over de hele app</string>
-    <string name="pref_use_send_button_to_indicate_status">Verstuur-knop toont status aan</string>
-    <string name="pref_use_indicate_received">Vraag ontvangstbevestigingen</string>
-    <string name="pref_use_indicate_received_summary">Indien ondersteund, worden ontvangen berichten met een groen vinkje aangeduid</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Kleur verstuur-knop in om status van contact weer te geven</string>
-    <string name="pref_expert_options_other">Andere</string>
-    <string name="pref_conference_name">Groepsgespreksnaam</string>
-    <string name="pref_conference_name_summary">Gebruik onderwerp van kamer ipv JID om groepsgesprekken te identificeren</string>
-    <string name="toast_message_otr_fingerprint">OTR vingerafdruk naar klembord gekopieerd!</string>
-    <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string>
-    <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
-    <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string>
-    <string name="using_account">account %s gebruiken</string>
-    <string name="checking_image">Afbeelding op HTTP host nakijken</string>
-    <string name="image_file_deleted">De afbeelding is verwijderd</string>
-    <string name="not_connected_try_again">Je bent niet verbonden. Probeer later opnieuw</string>
-    <string name="check_image_filesize">Bekijk bestandsgrootte van afbeelding</string>
-    <string name="message_options">Berichtopties</string>
-    <string name="copy_text">Kopieer tekst</string>
-    <string name="share_image">Deel afbeelding</string>
-    <string name="copy_original_url">Kopieer oorspronkelijke URL</string>
-    <string name="send_again">Verstuur opnieuw</string>
-    <string name="image_url">AfbeeldingsURL</string>
-    <string name="message_text">Berichttekst</string>
-    <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string>
-    <string name="message_copied_to_clipboard">Bericht gekopieerd naar klembord</string>
-    <string name="image_transmission_failed">Versturen van afbeelding mislukt</string>
-    <string name="scan_qr_code">Scan QR code</string>
-    <string name="show_qr_code">Toon QR code</string>
-    <string name="show_block_list">Toon geblokkeerde contacten</string>
-    <string name="account_details">Accountgegevens</string>
-    <string name="verify_otr">Bevestig OTR</string>
-    <string name="remote_fingerprint">Externe vingerafdruk</string>
-    <string name="scan">scan</string>
-    <string name="or_touch_phones">(of raak gsm\'s aan)</string>
-    <string name="smp">Socialist Millionaire Protocol</string>
-    <string name="shared_secret_hint">Hint of vraag</string>
-    <string name="shared_secret_secret">Gedeeld geheim</string>
-    <string name="confirm">Bevestigen</string>
-    <string name="in_progress">Bezig</string>
-    <string name="respond">Antwoorden</string>
-    <string name="failed">Mislukt</string>
-    <string name="secrets_do_not_match">Geheimen komen niet overeen</string>
-    <string name="try_again">Opnieuw proberen</string>
-    <string name="finish">Afsluiten</string>
-    <string name="verified">Bevestigd!</string>
-    <string name="smp_requested">Contact vraagt SMP-bevestiging</string>
-    <string name="no_otr_session_found">Geen geldige OTR-sessie gevonden!</string>
-    <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Raak aan om voorgrond-service uit te zetten</string>
-    <string name="pref_keep_foreground_service">Hou service in voorgrond</string>
-    <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
-    <string name="choose_file">Kies bestand</string>
-    <string name="receiving_file">Ontvange van %1$s bestand (%2$d%% voltooid)</string>
-    <string name="download_file">Download %s bestand</string>
-    <string name="open_file">Open %s bestand</string>
-    <string name="sending_file">versturen (%1$d%% voltooid)</string>
-    <string name="preparing_file">Bestand klaarmaken voor versturen</string>
-    <string name="file_offered_for_download">Bestand aangeboden om te downloaden</string>
-    <string name="file">%s bestand</string>
-    <string name="cancel_transmission">Annuleer bestandsoverdracht</string>
-    <string name="file_transmission_failed">bestandsoverdracht mislukt</string>
-    <string name="file_deleted">Het bestand is verwijderd</string>
-    <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string>
-    <string name="could_not_verify_fingerprint">Kon vingerafdruk niet bevestigen</string>
-    <string name="manually_verify">Handmatig bevestigen</string>
-    <string name="are_you_sure_verify_fingerprint">Ben je zeker dat je de OTR-vingerafdruk van je contact wil bevestigen?</string>
-    <string name="pref_show_dynamic_tags">Toon dynamische tags</string>
-    <string name="pref_show_dynamic_tags_summary">Toon enkel-lezen tags onder contacten</string>
-    <string name="enable_notifications">Meldingen aanzetten</string>
-    <string name="conference_with">Groepsgesprek aanmaken met…</string>
-    <string name="no_conference_server_found">Geen groepsgespreksserver gevonden</string>
-    <string name="conference_creation_failed">Aanmaken van groepsgesprek mislukt!</string>
-    <string name="conference_created">Groepsgesprek aangemaakt!</string>
-    <string name="secret_accepted">Geheim aanvaard!</string>
-    <string name="reset">Opnieuw instellen</string>
-    <string name="account_image_description">Account-avatar</string>
-    <string name="copy_otr_clipboard_description">Kopieer OTR-vingerafdruk naar klembord</string>
-    <string name="fetching_history_from_server">Geschiedenis van server halen</string>
-    <string name="no_more_history_on_server">Geen verdere geschiedenis op server</string>
-    <string name="updating">Bijwerken…</string>
-    <string name="password_changed">Wachtwoord gewijzigd!</string>
-    <string name="could_not_change_password">Kon wachtwoord niet wijzigen</string>
-
+  <string name="action_settings">Instellingen</string>
+  <string name="action_add">Nieuw gesprek</string>
+  <string name="action_accounts">Beheer account</string>
+  <string name="action_end_conversation">Beëindig gesprek</string>
+  <string name="action_contact_details">Contactgegevens</string>
+  <string name="action_muc_details">Gespreksgegevens</string>
+  <string name="action_secure">Beveiligd gesprek</string>
+  <string name="action_add_account">Voeg account toe</string>
+  <string name="action_edit_contact">Verander naam</string>
+  <string name="action_add_phone_book">Voeg toe aan telefoonboek</string>
+  <string name="action_delete_contact">Verwijder uit lijst</string>
+  <string name="action_block_contact">Blokkeer contact</string>
+  <string name="action_unblock_contact">Deblokkeer contact</string>
+  <string name="action_block_domain">Blokkeer domein</string>
+  <string name="action_unblock_domain">Deblokkeer domein</string>
+  <string name="title_activity_manage_accounts">Beheer accounts</string>
+  <string name="title_activity_settings">Instellingen</string>
+  <string name="title_activity_conference_details">Groepsgespreksgegevens</string>
+  <string name="title_activity_contact_details">Contactgegevens</string>
+  <string name="title_activity_sharewith">Delen met gesprek</string>
+  <string name="title_activity_start_conversation">Start gesprek</string>
+  <string name="title_activity_choose_contact">Kies contact</string>
+  <string name="title_activity_block_list">Geblokkeerde contacten</string>
+  <string name="just_now">net</string>
+  <string name="minute_ago">1 min. geleden</string>
+  <string name="minutes_ago">%d min. geleden</string>
+  <string name="unread_conversations">ongelezen gesprekken</string>
+  <string name="sending">versturen…</string>
+  <string name="encrypted_message">Bericht aan het ontsleutelen. Even geduld…</string>
+  <string name="nick_in_use">Naam is al in gebruik</string>
+  <string name="admin">Beheerder</string>
+  <string name="owner">Eigenaar</string>
+  <string name="moderator">Moderator</string>
+  <string name="participant">Deelnemer</string>
+  <string name="visitor">Bezoeker</string>
+  <string name="remove_contact_text">Wil je %s uit je lijst verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string>
+  <string name="block_contact_text">Wil je alle berichten van %s blokkeren?</string>
+  <string name="unblock_contact_text">Wil je %s deblokkeren en er weer berichten van kunnen ontvangen?</string>
+  <string name="block_domain_text">Alle contacten van %s blokkeren?</string>
+  <string name="unblock_domain_text">Alle contacten van %s deblokkeren?</string>
+  <string name="contact_blocked">Contact geblokkeerd</string>
+  <string name="remove_bookmark_text">Wil je %s als bladwijzer verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string>
+  <string name="register_account">Registreer nieuwe account op server</string>
+  <string name="change_password_on_server">Verander wachtwoord op server</string>
+  <string name="share_with">Deel met</string>
+  <string name="start_conversation">Start gesprek</string>
+  <string name="invite_contact">Nodig contact uit</string>
+  <string name="contacts">Contacten</string>
+  <string name="cancel">Annuleer</string>
+  <string name="set">Stel in</string>
+  <string name="add">Voeg toe</string>
+  <string name="edit">Bewerk</string>
+  <string name="delete">Verwijder</string>
+  <string name="block">Blokkeer</string>
+  <string name="unblock">Deblokkeer</string>
+  <string name="save">Sla op</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Conversations is gecrasht</string>
+  <string name="crash_report_message">Door het versturen van crash rapportages help je de ontwikkeling van Conversations.\n\n<b>Waarschuwing:</b> Deze app zal je XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string>
+  <string name="send_now">Nu versturen</string>
+  <string name="send_never">Niet opnieuw vragen</string>
+  <string name="problem_connecting_to_account">Account verbinden mislukt</string>
+  <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string>
+  <string name="touch_to_fix">Raak hier aan om accounts te beheren</string>
+  <string name="attach_file">Voeg bestand bij</string>
+  <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wil je het toevoegen?</string>
+  <string name="add_contact">Voeg contact toe</string>
+  <string name="send_failed">afleveren mislukt</string>
+  <string name="send_rejected">geweigerd</string>
+  <string name="preparing_image">Bezig met voorbereiden van versturen van afbeelding</string>
+  <string name="action_clear_history">Wis geschiedenis</string>
+  <string name="clear_conversation_history">Wis gespreksgeschiedenis</string>
+  <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
+  <string name="delete_messages">Verwijder berichten</string>
+  <string name="also_end_conversation">Beëindig dit gesprek na afloop</string>
+  <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
+  <string name="send_plain_text_message">Verstuur eenvoudig tekst bericht</string>
+  <string name="send_otr_message">Verstuur OTR versleuteld bericht</string>
+  <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string>
+  <string name="your_nick_has_been_changed">Je naam is veranderd</string>
+  <string name="download_image">Download afbeelding</string>
+  <string name="send_unencrypted">Verstuur onversleuteld</string>
+  <string name="decryption_failed">Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversations na installatie.)</small></string>
+  <string name="restart">Herstart</string>
+  <string name="install">Installeer</string>
+  <string name="offering">offering…</string>
+  <string name="waiting">wachten…</string>
+  <string name="no_pgp_key">Geen OpenPGP sleutel gevonden</string>
+  <string name="contact_has_no_pgp_key">Conversations kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string>
+  <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string>
+  <string name="contacts_have_no_pgp_keys">Conversations kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string>
+  <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
+  <string name="pref_general">Algemeen</string>
+  <string name="pref_xmpp_resource">XMPP resource</string>
+  <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string>
+  <string name="pref_accept_files">Accepteer bestanden</string>
+  <string name="pref_accept_files_summary">Accepteer automatisch bestanden kleiner dan…</string>
+  <string name="pref_notification_settings">Meldingsinstellingen</string>
+  <string name="pref_notifications">Meldingen</string>
+  <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string>
+  <string name="pref_vibrate">Trillen</string>
+  <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string>
+  <string name="pref_sound">Geluid</string>
+  <string name="pref_sound_summary">Speel ringtone af bij melding</string>
+  <string name="pref_conference_notifications">Groepsgespreksmeldingen</string>
+  <string name="pref_conference_notifications_summary">Toon altijd meldingen als er nieuwe berichten arriveren in groepsgesprekken in plaats van alleen wanneer gemarkeerd</string>
+  <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string>
+  <string name="pref_notification_grace_period_summary">Zet meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string>
+  <string name="pref_advanced_options">Geavanceerde instellingen</string>
+  <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string>
+  <string name="pref_never_send_crash_summary">Door crash rapportages te versturen help je de ontwikkeling van Conversations</string>
+  <string name="pref_confirm_messages">Bevestig berichten</string>
+  <string name="pref_confirm_messages_summary">Laat je contacten weten wanneer je berichten hebt ontvangen en gelezen</string>
+  <string name="pref_ui_options">UI opties</string>
+  <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
+  <string name="error_decrypting_file">I/O fout tijdens ontsleutelen bestand</string>
+  <string name="accept">Aanvaard</string>
+  <string name="error">Er is een fout opgetreden</string>
+  <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheidsupdates</string>
+  <string name="pref_grant_presence_updates_summary">Op voorhand toestemming verlenen en vragen aan contacten die je hebt aangemaakt</string>
+  <string name="subscriptions">Abonnementen</string>
+  <string name="your_account">Je account</string>
+  <string name="keys">Sleutels</string>
+  <string name="send_presence_updates">Verstuur aanwezigheidsupdates</string>
+  <string name="receive_presence_updates">Ontvang aanwezigheidsupdates</string>
+  <string name="ask_for_presence_updates">Vraag naar aanwezigheidsupdates</string>
+  <string name="attach_choose_picture">Kies afbeelding</string>
+  <string name="attach_take_picture">Neem foto</string>
+  <string name="preemptively_grant">Op voorhand toestemming verlenen voor abonneren</string>
+  <string name="error_not_an_image_file">Het bestand dat je gekozen hebt is geen afbeelding</string>
+  <string name="error_compressing_image">Fout tijdens converteren van afbeelding</string>
+  <string name="error_file_not_found">Bestand niet gevonden</string>
+  <string name="error_io_exception">Algemene I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string>
+  <string name="error_security_exception_during_image_copy">De app die je gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string>
+  <string name="account_status_unknown">Onbekend</string>
+  <string name="account_status_disabled">Tijdelijk uitgezet</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_connecting">Verbinden\u2026</string>
+  <string name="account_status_offline">Offline</string>
+  <string name="account_status_unauthorized">Niet gemachtigd</string>
+  <string name="account_status_not_found">Server niet gevonden</string>
+  <string name="account_status_no_internet">Geen verbinding</string>
+  <string name="account_status_regis_fail">Registratie mislukt</string>
+  <string name="account_status_regis_conflict">Gebruikersnaam bezet</string>
+  <string name="account_status_regis_success">Registratie compleet</string>
+  <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
+  <string name="account_status_security_error">Fout bij beveiliging</string>
+  <string name="account_status_incompatible_server">Incompatibele server</string>
+  <string name="encryption_choice_none">Onversleuteld</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Bewerk account</string>
+  <string name="mgmt_account_delete">Verwijder</string>
+  <string name="mgmt_account_disable">Tijdelijk uitzetten</string>
+  <string name="mgmt_account_publish_avatar">Publish avatar</string>
+  <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
+  <string name="mgmt_account_enable">Aanzetten</string>
+  <string name="mgmt_account_are_you_sure">Ben je zeker?</string>
+  <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert wordt je volledige gespreksgeschiedenis gewist</string>
+  <string name="attach_record_voice">Neem stem op</string>
+  <string name="account_settings_jabber_id">Jabber ID:</string>
+  <string name="account_settings_password">Wachtwoord:</string>
+  <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
+  <string name="account_settings_confirm_password">Bevestig wachtwoord:</string>
+  <string name="password">Wachtwoord</string>
+  <string name="confirm_password">Bevestig wachtwoord</string>
+  <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
+  <string name="invalid_jid">Dit is geen geldig Jabber ID</string>
+  <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
+  <string name="add_phone_book_text">Wil je %s toevoegen aan de contactenlijst op je telefoon?</string>
+  <string name="contact_status_online">online</string>
+  <string name="contact_status_free_to_chat">beschikbaar</string>
+  <string name="contact_status_away">weg</string>
+  <string name="contact_status_extended_away">langdurig weg</string>
+  <string name="contact_status_do_not_disturb">niet storen</string>
+  <string name="contact_status_offline">offline</string>
+  <string name="muc_details_conference">Groepsgesprek</string>
+  <string name="muc_details_other_members">Andere leden</string>
+  <string name="server_info_show_more">Server info</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">beschikbaar</string>
+  <string name="server_info_unavailable">niet beschikbaar</string>
+  <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string>
+  <string name="last_seen_now">zonet voor het laatst gezien</string>
+  <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string>
+  <string name="last_seen_mins">%d minuten geleden voor het laatst gezien</string>
+  <string name="last_seen_hour">1 uur geleden voor het laatst gezien</string>
+  <string name="last_seen_hours">%d uur geleden voor het laatst gezien</string>
+  <string name="last_seen_day">1 dag geleden voor het laatst gezien</string>
+  <string name="last_seen_days">%d dagen geleden voor het laatst gezien</string>
+  <string name="never_seen">nog nooit gezien</string>
+  <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string>
+  <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
+  <string name="openpgp_messages_found">OpenPGP-versleutelde berichten gevonden</string>
+  <string name="reception_failed">Ontvangen mislukt</string>
+  <string name="your_fingerprint">Jouw vingerafdruk</string>
+  <string name="otr_fingerprint">OTR vingerafdruk</string>
+  <string name="verify">Bevestig</string>
+  <string name="decrypt">Ontsleutel</string>
+  <string name="conferences">Groepsgesprekken</string>
+  <string name="search">Zoeken</string>
+  <string name="create_contact">Maak contact aan</string>
+  <string name="join_conference">Aan groepsgesprek deelnemen</string>
+  <string name="delete_contact">Verwijder contact</string>
+  <string name="view_contact_details">Bekijk contactgegevens</string>
+  <string name="block_contact">Blokkeer contact</string>
+  <string name="unblock_contact">Deblokkeer contact</string>
+  <string name="create">Aanmaken</string>
+  <string name="contact_already_exists">Het contact bestaat al</string>
+  <string name="join">Deelnemen</string>
+  <string name="conference_address">Gespreksadres</string>
+  <string name="conference_address_example">kamer@groepsgesprek.voorbeeld.be</string>
+  <string name="save_as_bookmark">Opslaan als bladwijzer</string>
+  <string name="delete_bookmark">Bladwijzer verwijderen</string>
+  <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
+  <string name="you">Jij</string>
+  <string name="action_edit_subject">Onderwerp groepsgesprek bewerken</string>
+  <string name="conference_not_found">Groepsgesprek niet gevonden</string>
+  <string name="leave">Verlaten</string>
+  <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
+  <string name="add_back">Contact toevoegen aan eigen contacten</string>
+  <string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string>
+  <string name="publish">Publiceer</string>
+  <string name="touch_to_choose_picture">Raak avatar aan om een foto uit de galerij te kiezen</string>
+  <string name="publish_avatar_explanation"><b>Aandacht:</b> Iedereen die je aanwezigheidsupdates ontvangt zal deze foto kunnen zien.</string>
+  <string name="publishing">Publiceren…</string>
+  <string name="error_publish_avatar_server_reject">De server weigerde de publicatie van je afbeelding</string>
+  <string name="error_publish_avatar_converting">Fout bij converteren van afbeelding</string>
+  <string name="error_saving_avatar">Fout bij opslaan van avatar</string>
+  <string name="or_long_press_for_default">(Of hou lang ingedrukt om de oorspronkelijke terug te zetten)</string>
+  <string name="error_publish_avatar_no_server_support">Je server ondersteunt de publicatie van avatars niet</string>
+  <string name="private_message">gefluisterd</string>
+  <string name="private_message_to">naar %s</string>
+  <string name="send_private_message_to">Stuur privébericht naar %s</string>
+  <string name="connect">Verbinden</string>
+  <string name="account_already_exists">Deze account bestaat al</string>
+  <string name="next">Volgende</string>
+  <string name="server_info_session_established">Huidige sessie gevestigd</string>
+  <string name="additional_information">Bijkomstige informatie</string>
+  <string name="skip">Overslaan</string>
+  <string name="disable_notifications">Meldingen uitzetten</string>
+  <string name="disable_notifications_for_this_conversation">Meldingen uitzetten voor dit gesprek</string>
+  <string name="notifications_disabled">Meldingen zijn uitgezet</string>
+  <string name="enable">Aanzetten</string>
+  <string name="conference_requires_password">Wachtwoord nodig voor toegang tot groepsgesprek</string>
+  <string name="enter_password">Wachtwoord:</string>
+  <string name="missing_presence_updates">Ontbrekende aanwezigheidsupdates van contact</string>
+  <string name="request_presence_updates">Vraag eerst aanwezigheidsupdates van je contact aan.\n\n<small>Dit wordt gebruikt om te bepalen welke client(s) je contact gebruikt.</small></string>
+  <string name="request_now">Nu aanvragen</string>
+  <string name="delete_fingerprint">Vingerafdruk verwijderen</string>
+  <string name="sure_delete_fingerprint">Ben je zeker dat je deze vingerafdruk wil verwijderen?</string>
+  <string name="ignore">Negeren</string>
+  <string name="without_mutual_presence_updates"><b>Waarschuwing:</b> Dit verzenden zonder wederzijdse aanwezigheidsupdates kan voor onverwachte problemen zorgen.\n\n<small>Ga naar contactgegevens om je aanwezigheidsupdates te bevestigen.</small></string>
+  <string name="pref_encryption_settings">Versleutelingsinstellingen</string>
+  <string name="pref_force_encryption">Verplicht end-to-end versleuteling</string>
+  <string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string>
+  <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string>
+  <string name="pref_dont_save_encrypted_summary"><b>Waarschuwing:</b> Dit kan leiden tot verlies van berichten</string>
+  <string name="pref_expert_options">Expert-instellingen</string>
+  <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
+  <string name="title_activity_about">Over Conversations</string>
+  <string name="pref_about_conversations_summary">Build en licentie-informatie</string>
+  <string name="title_pref_quiet_hours">Stille uren</string>
+  <string name="title_pref_quiet_hours_start_time">Begintijd</string>
+  <string name="title_pref_quiet_hours_end_time">Eindtijd</string>
+  <string name="title_pref_enable_quiet_hours">Stille uren aanzetten</string>
+  <string name="pref_quiet_hours_summary">Tijdens stille uren worden meldingen onderdrukt</string>
+  <string name="pref_use_larger_font">Vergroot lettergrootte</string>
+  <string name="pref_use_larger_font_summary">Gebruik grotere lettertypes over de hele app</string>
+  <string name="pref_use_send_button_to_indicate_status">Verstuur-knop toont status aan</string>
+  <string name="pref_use_indicate_received">Vraag ontvangstbevestigingen</string>
+  <string name="pref_use_indicate_received_summary">Indien ondersteund, worden ontvangen berichten met een groen vinkje aangeduid</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Kleur verstuur-knop in om status van contact weer te geven</string>
+  <string name="pref_expert_options_other">Andere</string>
+  <string name="pref_conference_name">Groepsgespreksnaam</string>
+  <string name="pref_conference_name_summary">Gebruik onderwerp van kamer ipv JID om groepsgesprekken te identificeren</string>
+  <string name="toast_message_otr_fingerprint">OTR vingerafdruk naar klembord gekopieerd!</string>
+  <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string>
+  <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
+  <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string>
+  <string name="using_account">account %s gebruiken</string>
+  <string name="checking_image">Afbeelding op HTTP host nakijken</string>
+  <string name="image_file_deleted">De afbeelding is verwijderd</string>
+  <string name="not_connected_try_again">Je bent niet verbonden. Probeer later opnieuw</string>
+  <string name="check_image_filesize">Bekijk bestandsgrootte van afbeelding</string>
+  <string name="message_options">Berichtopties</string>
+  <string name="copy_text">Kopieer tekst</string>
+  <string name="copy_original_url">Kopieer oorspronkelijke URL</string>
+  <string name="send_again">Verstuur opnieuw</string>
+  <string name="image_url">AfbeeldingsURL</string>
+  <string name="message_text">Berichttekst</string>
+  <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string>
+  <string name="message_copied_to_clipboard">Bericht gekopieerd naar klembord</string>
+  <string name="image_transmission_failed">Versturen van afbeelding mislukt</string>
+  <string name="scan_qr_code">Scan QR code</string>
+  <string name="show_qr_code">Toon QR code</string>
+  <string name="show_block_list">Toon geblokkeerde contacten</string>
+  <string name="account_details">Accountgegevens</string>
+  <string name="verify_otr">Bevestig OTR</string>
+  <string name="remote_fingerprint">Externe vingerafdruk</string>
+  <string name="scan">scan</string>
+  <string name="or_touch_phones">(of raak gsm\'s aan)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Hint of vraag</string>
+  <string name="shared_secret_secret">Gedeeld geheim</string>
+  <string name="confirm">Bevestigen</string>
+  <string name="in_progress">Bezig</string>
+  <string name="respond">Antwoorden</string>
+  <string name="failed">Mislukt</string>
+  <string name="secrets_do_not_match">Geheimen komen niet overeen</string>
+  <string name="try_again">Opnieuw proberen</string>
+  <string name="finish">Afsluiten</string>
+  <string name="verified">Bevestigd!</string>
+  <string name="smp_requested">Contact vraagt SMP-bevestiging</string>
+  <string name="no_otr_session_found">Geen geldige OTR-sessie gevonden!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Hou service in voorgrond</string>
+  <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
+  <string name="choose_file">Kies bestand</string>
+  <string name="receiving_x_file">Ontvangen van %1$s (%2$d%% voltooid)</string>
+  <string name="download_x_file">Download %s</string>
+  <string name="file">bestand</string>
+  <string name="open_x_file">Open %s</string>
+  <string name="sending_file">versturen (%1$d%% voltooid)</string>
+  <string name="preparing_file">Bestand klaarmaken voor versturen</string>
+  <string name="x_file_offered_for_download">%s aangeboden om te downloaden</string>
+  <string name="cancel_transmission">Annuleer bestandsoverdracht</string>
+  <string name="file_transmission_failed">bestandsoverdracht mislukt</string>
+  <string name="file_deleted">Het bestand is verwijderd</string>
+  <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string>
+  <string name="could_not_verify_fingerprint">Kon vingerafdruk niet bevestigen</string>
+  <string name="manually_verify">Handmatig bevestigen</string>
+  <string name="are_you_sure_verify_fingerprint">Ben je zeker dat je de OTR-vingerafdruk van je contact wil bevestigen?</string>
+  <string name="pref_show_dynamic_tags">Toon dynamische tags</string>
+  <string name="pref_show_dynamic_tags_summary">Toon enkel-lezen tags onder contacten</string>
+  <string name="enable_notifications">Meldingen aanzetten</string>
+  <string name="conference_with">Groepsgesprek aanmaken met…</string>
+  <string name="no_conference_server_found">Geen groepsgespreksserver gevonden</string>
+  <string name="conference_creation_failed">Aanmaken van groepsgesprek mislukt!</string>
+  <string name="conference_created">Groepsgesprek aangemaakt!</string>
+  <string name="secret_accepted">Geheim aanvaard!</string>
+  <string name="reset">Opnieuw instellen</string>
+  <string name="account_image_description">Account-avatar</string>
+  <string name="copy_otr_clipboard_description">Kopieer OTR-vingerafdruk naar klembord</string>
+  <string name="fetching_history_from_server">Geschiedenis van server halen</string>
+  <string name="no_more_history_on_server">Geen verdere geschiedenis op server</string>
+  <string name="updating">Bijwerken…</string>
+  <string name="password_changed">Wachtwoord gewijzigd!</string>
+  <string name="could_not_change_password">Kon wachtwoord niet wijzigen</string>
+  <string name="otr_session_not_started">Verstuur een bericht om een versleuteld gesprek te starten</string>
+  <string name="ask_question">Stel een vraag</string>
+  <string name="smp_explain_question">Als jij en je contact een gemeenschappelijk geheim hebben dat niemand anders weet (zoals een privé-grap of gewoonweg wat jullie gegeten hebben de laatste keer dat jullie elkaar zagen) kunnen jullie dat geheim gebruiken om elkaars vingerafdrukken te bevestigen.\n\nJe geeft een hint of een vraag voor je contact, en hij/zij moet hier op antwoorden met een hoofdlettergevoelig antwoord.</string>
+  <string name="smp_explain_answer">Je contact wil je vingerafdruk bevestigen door je uit te dagen met een gedeeld geheim. Je contact heeft daarvoor volgende hint of vraag opgegeven.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Je hint zou niet leeg mogen zijn</string>
+  <string name="shared_secret_can_not_be_empty">Je gedeeld geheim can niet leeg zijn</string>
+  <string name="manual_verification_explanation">Vergelijk voorzichtig de vingerafdruk hieronder met de vingerafdruk van je contact.\nJe kan hiervoor eender welke betrouwbare vorm van communicatie gebruiken, zoals een versleutelde e-mail of een telefoongesprek.</string>
+  <string name="change_password">Wachtwoord wijzigen</string>
+  <string name="current_password">Huidig wachtwoord</string>
+  <string name="new_password">Nieuw wachtwoord</string>
+  <string name="password_should_not_be_empty">Wachtwoord zou niet leeg mogen zijn</string>
+  <string name="enable_all_accounts">Alle accounts aanzetten</string>
+  <string name="disable_all_accounts">Alle accounts uitzetten</string>
+  <string name="perform_action_with">Actie uitvoeren met</string>
+  <string name="no_affiliation">Geen aansluiting</string>
+  <string name="no_role">Geen rol</string>
+  <string name="outcast">Verstoteling</string>
+  <string name="member">Lid</string>
+  <string name="advanced_mode">Geavanceerde modus</string>
+  <string name="grant_membership">Lidmaatschap verlenen</string>
+  <string name="remove_membership">Lidmaatschap verwijderen</string>
+  <string name="grant_admin_privileges">Administratorprivileges verlenen</string>
+  <string name="remove_admin_privileges">Administratorprivileges verwijderen</string>
+  <string name="remove_from_room">Verwijderen uit kamer</string>
+  <string name="could_not_change_affiliation">Kon aansluiting niet wijzigen</string>
+  <string name="ban_from_conference">Verbannen uit groepsgesprek</string>
+  <string name="removing_from_public_conference">Je probeert %s te verwijderen uit een publiek groepsgesprek. De enige manier om dat te doen is door hem/haar permanent te verbannen.</string>
+  <string name="ban_now">Nu verbannen</string>
+  <string name="could_not_change_role">Kon rol van %s niet wijzigen</string>
+  <string name="public_conference">Publiek toegankelijk groepsgesprek</string>
+  <string name="private_conference">Privé groepsgesprek, enkel toegankelijk voor leden</string>
+  <string name="conference_options">Groepsgespreksopties</string>
+  <string name="members_only">Privé (alleen leden)</string>
+  <string name="non_anonymous">Niet anoniem</string>
+  <string name="modified_conference_options">Groepsgespreksopties aangepast!</string>
+  <string name="could_not_modify_conference_options">Kon groepsgespreksopties niet aanpassen</string>
+  <string name="never">Nooit</string>
+  <string name="thirty_minutes">30 minuten</string>
+  <string name="one_hour">1 uur</string>
+  <string name="two_hours">2 uur</string>
+  <string name="eight_hours">8 uur</string>
+  <string name="until_further_notice">Voor onbepaalde duur</string>
+  <string name="pref_input_options">Input-opties</string>
+  <string name="pref_enter_is_send">Enter is versturen</string>
+  <string name="pref_enter_is_send_summary">Gebruik de enter-toets om berichten te versturen</string>
+  <string name="pref_display_enter_key">Toon enter-toets</string>
+  <string name="pref_display_enter_key_summary">Verander de emoticon-toets in een enter-toets</string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">afbeelding</string>
+  <string name="pdf_document">PDF-document</string>
+  <string name="apk">Android-applicatie</string>
+  <string name="vcard">Contact</string>
+  <string name="received_x_file">%s ontvangen</string>
+  <string name="disable_foreground_service">Voorgrond-service uitzetten</string>
+  <string name="touch_to_open_conversations">Raak aan om Conversations te openen</string>
+  <string name="avatar_has_been_published">Avatar is gepubliceerd!</string>
+  <string name="sending_x_file">Bezig met versturen van %s</string>
+  <string name="offering_x_file">Bezig met aanbieden van %s</string>
+  <string name="hide_offline">Offline verbergen</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 00000000..9572b3db
--- /dev/null
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Configuratie</string>
+  <string name="action_add">Conversatie noua</string>
+  <string name="action_accounts">Configureaza conturi</string>
+  <string name="action_end_conversation">Termina conversatie</string>
+  <string name="action_contact_details">Detalii contact</string>
+  <string name="action_muc_details">Detalii conferinta</string>
+  <string name="action_secure">Securizeaza conferinta</string>
+  <string name="action_add_account">Adauga cont</string>
+  <string name="action_edit_contact">Editeaza nume</string>
+  <string name="action_add_phone_book">Adauga in agenda</string>
+  <string name="action_delete_contact">Sterge din lista</string>
+  <string name="action_block_contact">Blocheaza contact</string>
+  <string name="action_unblock_contact">Deblocheaza contact</string>
+  <string name="action_block_domain">Blocheaza domeniu</string>
+  <string name="action_unblock_domain">Deblocheaza domeniu</string>
+  <string name="title_activity_manage_accounts">Configureaza conturi</string>
+  <string name="title_activity_settings">Configuratie</string>
+  <string name="title_activity_conference_details">Detalii conferinta</string>
+  <string name="title_activity_contact_details">Detalii contact</string>
+  <string name="title_activity_sharewith">Distribuie catre Conversatie</string>
+  <string name="title_activity_start_conversation">Porneste Conversatie</string>
+  <string name="title_activity_choose_contact">Alege contact</string>
+  <string name="title_activity_block_list">Blocheaza lista</string>
+  <string name="just_now">in acest moment</string>
+  <string name="minute_ago">acuma 1 minut</string>
+  <string name="minutes_ago">acuma %d minute</string>
+  <string name="unread_conversations">Conversatii necitite</string>
+  <string name="sending">trimitere...</string>
+  <string name="encrypted_message">Decriptez mesaj. Te rog asteapta...</string>
+  <string name="nick_in_use">Nume utilizator este deja folosit.</string>
+  <string name="admin">Admin</string>
+  <string name="owner">Proprietar</string>
+  <string name="moderator">Moderator</string>
+  <string name="participant">Participant</string>
+  <string name="visitor">Vizitator</string>
+  <string name="remove_contact_text">Ai dori sa stergi %s din lista? Conversatia asociata cu acest contact nu va fi stearsa.</string>
+  <string name="block_contact_text">Ai dori sa blochezi pe %s din a-ti trimite mesaje?</string>
+  <string name="unblock_contact_text">Ai dori sa deblochezi pe %s si sa ii permiti sa iti trimite mesaje?</string>
+  <string name="block_domain_text">Blocheaza toate contactele de la %s?</string>
+  <string name="unblock_domain_text">Deblocheaza toate contactele de la %s?</string>
+  <string name="contact_blocked">Contact blocat</string>
+  <string name="remove_bookmark_text">Ai dori sa stergi pe %s ca semn de carte? Conversatia asociata cu acest semn de carte nu va fi stearsa.</string>
+  <string name="register_account">Inregistreaza un cont nou pe server</string>
+  <string name="change_password_on_server">Schimba parola pe server</string>
+  <string name="start_conversation">Porneste Conversatie</string>
+  <string name="invite_contact">Invita Contact</string>
+  <string name="contacts">Contacte</string>
+  <string name="cancel">Anuleaza</string>
+  <string name="set">Seteaza</string>
+  <string name="add">Adauga</string>
+  <string name="edit">Editeaza</string>
+  <string name="delete">Sterge</string>
+  <string name="block">Blocheaza</string>
+  <string name="unblock">Deblocheaza</string>
+  <string name="save">Salveaza</string>
+  <string name="ok">DA</string>
+  <string name="crash_report_title">Conversatii s-a oprit neasteptat</string>
+  <string name="crash_report_message">Trimitand date ajuti la dezvoltarea aplicatiei Conversatii\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
+  <string name="send_now">Trimie acum</string>
+  <string name="send_never">Nu mai intreba in viitor</string>
+  <string name="problem_connecting_to_account">Nu ma pot conecta la cont</string>
+  <string name="problem_connecting_to_accounts">Nu ma pot conecta la conturi multiple</string>
+  <string name="touch_to_fix">Apasa aici pentru a configura conturile tale</string>
+  <string name="attach_file">Ataseaza fisier</string>
+  <string name="not_in_roster">Contactul nu este in lista ta. Ai vrea sa il adaugi?</string>
+  <string name="add_contact">Adauga contact</string>
+  <string name="send_failed">Trimitere esuata</string>
+  <string name="send_rejected">rejectat</string>
+  <string name="preparing_image">Pregatesc imaginea pentru transmisie</string>
+  <string name="action_clear_history">Sterge istoria</string>
+  <string name="clear_conversation_history">Sterge istoria conversatiei</string>
+  <string name="clear_histor_msg">Doresti sa stergi toate mesajele din Conversatii?\n\n<b>Atentie:</b> Aceasta actiune nu va influenta mesajele aflate pe alte telefoane/tabelete/servere.</string>
+  <string name="delete_messages">Sterge mesajele</string>
+  <string name="also_end_conversation">Termina conversatia aceasta dupa</string>
+  <string name="choose_presence">Alege prezenta pentru a contacta</string>
+  <string name="send_plain_text_message">Trimite text necriptat</string>
+  <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
+  <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
+  <string name="your_nick_has_been_changed">Numele tau a fost schimbat</string>
+  <string name="download_image">Copiaza imagine</string>
+  <string name="send_unencrypted">Trimite necriptat</string>
+  <string name="decryption_failed">Decriptia a esuat. Poate nu ai cheia privata corecta.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Coonversatii utilizeaza o aplicatia externa <b>OpenKeychain</b> pentru a cripta si decripta mesaje si a administra cheile publice.\n\nOpenKeychain este licentiat sub GPLv3 si se gaseste pentru copiere pe F-Droid si Google Play.\n\n<small>(Te rog sa repornesti Conversatii dupa.)</small></string>
+  <string name="restart">Reporneste</string>
+  <string name="install">Instaleaza</string>
+  <string name="offering">Transmit...</string>
+  <string name="waiting">In asteptare...</string>
+  <string name="no_pgp_key">Nu am gasit cheie OpenPGP</string>
+  <string name="contact_has_no_pgp_key">Conversatii nu a putut sa cirpteze mesajele tale din cauza contactului care nu isi anunta cheia publica.\n\n<small>Roaga contactul sa isi configureze OpenPGP.</small></string>
+</resources>
diff --git a/src/main/res/values-ru/arrays.xml b/src/main/res/values-ru/arrays.xml
deleted file mode 100644
index d01d4eb9..00000000
--- a/src/main/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Мобильный</item>
-        <item>Телефон</item>
-        <item>Планшет</item>
-        <item>Conversations</item>
-        <item>Андроид</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>никогда</item>
-        <item>256 Кб</item>
-        <item>512 Кб</item>
-        <item>1 Мб</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index efc5ba6c..4a96a7fe 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1,259 +1,252 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Настройки</string>
-    <string name="action_add">Новая беседа</string>
-    <string name="action_accounts">Управление аккаунтами</string>
-    <string name="action_end_conversation">Закончить текущую беседу</string>
-    <string name="action_contact_details">Сведения о контакте</string>
-    <string name="action_muc_details">Сведения о конференции</string>
-    <string name="action_secure">Защищенная беседа</string>
-    <string name="action_add_account">Добавить аккаунт</string>
-    <string name="action_edit_contact">Редактировать контакт</string>
-    <string name="action_add_phone_book">Добавить в телефонную книгу</string>
-    <string name="action_delete_contact">Удалить из списка</string>
-    <string name="title_activity_manage_accounts">Управление Аккаунтами</string>
-    <string name="title_activity_settings">Настройки</string>
-    <string name="title_activity_conference_details">Сведения о Конференции</string>
-    <string name="title_activity_contact_details">Сведения о Контакте</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">Поделиться</string>
-    <string name="title_activity_start_conversation">Начать беседу</string>
-    <string name="title_activity_choose_contact">Выберите собеседника</string>
-    <string name="just_now">только что</string>
-    <string name="minute_ago">1 минуту назад</string>
-    <string name="minutes_ago">%d мин. назад</string>
-    <string name="unread_conversations">непрочитанных сообщений</string>
-    <string name="sending">отправка&#8230;</string>
-    <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите&#8230;</string>
-    <string name="nick_in_use">Имя уже используется</string>
-    <string name="admin">Администратор</string>
-    <string name="owner">Владелец</string>
-    <string name="moderator">Модератор</string>
-    <string name="participant">Участник</string>
-    <string name="visitor">Посетитель</string>
-    <string name="remove_contact_text">Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены.</string>
-    <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой будут сохранены</string>
-    <string name="register_account">Создать новый аккаунт на сервере</string>
-    <string name="share_with">Поделиться с</string>
-    <string name="start_conversation">Начать беседу</string>
-    <string name="invite_contact">Пригласить собеседника</string>
-    <string name="contacts">Контакты</string>
-    <string name="cancel">Отмена</string>
-    <string name="add">Добавить</string>
-    <string name="edit">Редактировать</string>
-    <string name="delete">Удалить</string>
-    <string name="save">Сохранить</string>
-    <string name="ok">ОК</string>
-    <string name="crash_report_title">Conversations был неожиданно остановлен</string>
-    <string name="crash_report_message">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить программу, поддерживая дальнейшее развитие программы\n<b>Предупреждение:</b>Отчет об ошибке будет отправлен разработчику, используя ваш аккаунт XMPP.</string>
-    <string name="send_now">Отправить сейчас</string>
-    <string name="send_never">Больше не спрашивать</string>
-    <string name="problem_connecting_to_account">Не удается подключиться к аккаунту</string>
-    <string name="problem_connecting_to_accounts">Не удается подключиться к аккаунтам</string>
-    <string name="touch_to_fix">Нажмите здесь, чтобы настроить свои аккаунты</string>
-    <string name="attach_file">Прикрепить файл</string>
-    <string name="not_in_roster">Контакт не находится в вашем списке. Хотите добавить его?</string>
-    <string name="add_contact">Добавить контакт</string>
-    <string name="send_failed">доставка не удалась</string>
-    <string name="send_rejected">отклонено</string>
-    <string name="receiving_image">Получение изображения. Пожалуйста подождите&#8230;</string>
-    <string name="preparing_image">Подготовка изображения к передаче</string>
-    <string name="action_clear_history">Очистить историю</string>
-    <string name="clear_conversation_history">Очистить историю</string>
-    <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
-    <string name="delete_messages">Удалить сообщения</string>
-    <string name="also_end_conversation">Завершить беседу</string>
-    <string name="choose_presence">Укажите статус для контакта</string>
-    <string name="send_plain_text_message">Отправить незашифрованное текстовое сообщение</string>
-    <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
-    <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
-    <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
-    <string name="download_image">Загрузить изображение</string>
-    <string name="image_offered_for_download"><i>Изображение предложено для загрузки</i></string>
-    <string name="send_unencrypted">Отправить в незашифрованном виде</string>
-    <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
-    <string name="openkeychain_required">Установите OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations использует стороннее приложение под названием <b>OpenKeychain</b> для шифрования и расшифрования сообщений и управления открытыми ключами.\nПрограмма OpenKeychain распространяется под лицензией GPLv3 и доступна для загрузки через F-Droid или Google Play.\n\n<small>(Потребуется перезапуск Conversations после установки.)</small></string>
-    <string name="restart">Перезапуск</string>
-    <string name="install">Установка</string>
-    <string name="offering">предложение&#8230;</string>
-    <string name="waiting">ожидание&#8230;</string>
-    <string name="no_pgp_key">Нет OpenPGP ключа</string>
-    <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что удаленный пользователь не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите удаленного пользователя тоже установить OpenPGP.</small></string>
-    <string name="no_pgp_keys">Нет OpenPGP ключей</string>
-    <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщения, потому что удаленные пользователи не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите удаленных пользователей тоже установить OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
-    <string name="encrypted_image_received"><i>Зашифрованное изображение получено. Нажмите здесь, чтобы расшифровать и посмотреть изображение.</i></string>
-    <string name="image_file"><i>Изображение получено. Нажмите здесь, чтобы посмотреть.</i></string>
-    <string name="pref_general">Общие</string>
-    <string name="pref_xmpp_resource">Название ресурса</string>
-    <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
-    <string name="pref_accept_files">Принимать файлы</string>
-    <string name="pref_accept_files_summary">Автоматический прием файлов&#8230;</string>
-    <string name="pref_notification_settings">Настройки Уведомлений</string>
-    <string name="pref_notifications">Уведомление</string>
-    <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
-    <string name="pref_vibrate">Вибрация</string>
-    <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
-    <string name="pref_sound">Звуковой сигнал</string>
-    <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
-    <string name="pref_conference_notifications">Уведомления конференции</string>
-    <string name="pref_conference_notifications_summary">Всегда сообщать при получении нового сообщения в конференции</string>
-    <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
-    <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
-    <string name="pref_advanced_options">Дополнительные параметры</string>
-    <string name="pref_never_send_crash">Отчеты об ошибках</string>
-    <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
-    <string name="pref_confirm_messages">Отчеты о получении</string>
-    <string name="pref_confirm_messages_summary">Разрешить уведомлять отправителя, когда вы получили и прочитали сообщение</string>
-    <string name="pref_ui_options">Параметры интерфейса</string>
-    <string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
-    <string name="error_decrypting_file">Ошибка расшифровки файла</string>
-    <string name="accept">Принять</string>
-    <string name="error">Произошла ошибка</string>
-    <string name="pref_grant_presence_updates">Предоставлять обновления</string>
-    <string name="pref_grant_presence_updates_summary">Разрешить и запрашивать статус присутствия для созданных вами контактов</string>
-    <string name="subscriptions">Подписки</string>
-    <string name="your_account">Ваш аккаунт</string>
-    <string name="keys">Ключи</string>
-    <string name="send_presence_updates">Анонсировать статус присутствия</string>
-    <string name="receive_presence_updates">Получать обновления статусов присутствия</string>
-    <string name="ask_for_presence_updates">Запрашивать обновления статусов присутствия</string>
-    <string name="attach_choose_picture">Выберите изображение</string>
-    <string name="attach_take_picture">Снимите изображение</string>
-    <string name="preemptively_grant">Удовлетворять запросы на подписки</string>
-    <string name="error_not_an_image_file">Выбранный файл не является изображением</string>
-    <string name="error_compressing_image">Ошибка при преобразовании изображения</string>
-    <string name="error_file_not_found">Файл не найден</string>
-    <string name="error_io_exception">Общая ошибка ввода/вывода. Возможно, на устройстве недостаточно свободного места?</string>
-    <string name="error_security_exception_during_image_copy">Приложение, которое было использовано для выбора изображения не имеет достаточных прав для чтения файла.\n\n<small>Используйте другой файловый менеджер, чтобы выбрать изображение</small></string>
-    <string name="account_status_unknown">Неизвестен</string>
-    <string name="account_status_disabled">Временно отключен</string>
-    <string name="account_status_online">В сети</string>
-    <string name="account_status_offline">Не в сети</string>
-    <string name="account_status_connecting">Соединение\u2026</string>
-    <string name="account_status_unauthorized">Неавторизован</string>
-    <string name="account_status_not_found">Сервер не найден</string>
-    <string name="account_status_no_internet">Нет подключения к сети</string>
-    <string name="account_status_regis_fail">Регистрация не удалась</string>
-    <string name="account_status_regis_conflict">Имя пользователя уже используется</string>
-    <string name="account_status_regis_success">Регистрация завершена</string>
-    <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string>
-    <string name="encryption_choice_none">Без шифрования</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Редактировать аккаунт</string>
-    <string name="mgmt_account_delete">Удалить</string>
-    <string name="mgmt_account_disable">Отключить</string>
-    <string name="mgmt_account_publish_avatar">Разместить аватар</string>
-    <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
-    <string name="mgmt_account_enable">Включить</string>
-    <string name="mgmt_account_are_you_sure">Вы уверены?</string>
-    <string name="mgmt_account_delete_confirm_text">Если вы удалите свой аккаунт, вся ваша история будет потеряна</string>
-    <string name="attach_record_voice">Запись голоса</string>
-    <string name="account_settings_jabber_id">JID (Джаббер ID)</string>
-    <string name="account_settings_password">Пароль</string>
-    <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">Подтвердите пароль</string>
-    <string name="password">Пароль</string>
-    <string name="confirm_password">Подтвердите пароль</string>
-    <string name="passwords_do_not_match">Пароли не совпадают</string>
-    <string name="invalid_jid">Недопустимый JID (Джаббер ID)</string>
-    <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
-    <string name="add_phone_book_text">Вы хотите добавить %s в свою телефонную книгу?</string>
-    <string name="contact_status_online">в сети</string>
-    <string name="contact_status_free_to_chat">свободен для общения</string>
-    <string name="contact_status_away">скоро буду</string>
-    <string name="contact_status_extended_away">буду не скоро</string>
-    <string name="contact_status_do_not_disturb">не беспокоить</string>
-    <string name="contact_status_offline">не в сети</string>
-    <string name="muc_details_conference">Конференция</string>
-    <string name="muc_details_other_members">Другие участники</string>
-    <string name="server_info_carbon_messages">Дублирование сообщений</string>
-    <string name="server_info_stream_management">Управление потоками</string>
-    <string name="server_info_pep">XEP-0163: PEP (Аватары)</string>
-    <string name="server_info_available">доступен</string>
-    <string name="server_info_unavailable">недоступен</string>
-    <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
-    <string name="last_seen_now">Присутствие: только что</string>
-    <string name="last_seen_min">Присутствие: 1 минуту назад</string>
-    <string name="last_seen_mins">Присутствие: %d мин. назад</string>
-    <string name="last_seen_hour">Присутствие: 1 час назад</string>
-    <string name="last_seen_hours">Присутствие: %d час. назад</string>
-    <string name="last_seen_day">Присутствие: 1 день назад</string>
-    <string name="last_seen_days">Присутствие: %d дн. назад</string>
-    <string name="never_seen">Никогда</string>
-    <string name="install_openkeychain">Зашифрованное сообщение. Пожалуйста, установите OpenKeychain для дешифрования.</string>
-    <string name="unknown_otr_fingerprint">Неизвестная контрольная сумма криптографического протокола OTR</string>
-    <string name="openpgp_messages_found">Найдены OpenPGP зашифрованые сообщения</string>
-    <string name="reception_failed">Прием не удался</string>
-    <string name="your_fingerprint">Контрольная сумма</string>
-    <string name="otr_fingerprint">OTR контрольная сумма</string>
-    <string name="verify">Подтвердить</string>
-    <string name="decrypt">Дешифровать</string>
-    <string name="conferences">Конференции</string>
-    <string name="search">Поиск</string>
-    <string name="create_contact">Создать контакт</string>
-    <string name="join_conference">Присоединиться к конференции</string>
-    <string name="delete_contact">Удалить Контакт</string>
-    <string name="view_contact_details">Посмотреть данные контакта</string>
-    <string name="create">Создать</string>
-    <string name="contact_already_exists">Контакт уже существует</string>
-    <string name="join">Присоединиться</string>
-    <string name="conference_address">Адрес конференции</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">Сохранить закладку</string>
-    <string name="delete_bookmark">Удалить закладку</string>
-    <string name="bookmark_already_exists">Такая закладка уже существует</string>
-    <string name="you">Вы</string>
-    <string name="action_edit_subject">Редактировать тему конференции</string>
-    <string name="conference_not_found">Конференция не найдена</string>
-    <string name="leave">Покинуть</string>
-    <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
-    <string name="add_back">Добавить в ответ</string>
-    <string name="contact_has_read_up_to_this_point">%s прочит. сообщ. до этого момента</string>
-    <string name="publish">Опубликовать</string>
-    <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
-    <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
-    <string name="publishing">Установка&#8230;</string>
-    <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
-    <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
-    <string name="error_saving_avatar">Не удалось сохранить аватар</string>
-    <string name="or_long_press_for_default">(Или долгое прикосновение, чтобы вернуть значения по умолчанию)</string>
-    <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
-    <string name="private_message">Отправить личное сообщение для %s</string>
-    <string name="private_message_to">отправить %s</string>
-    <string name="send_private_message_to">Отправить личное сообщение для %s</string>
-    <string name="connect">Подключиться</string>
-    <string name="account_already_exists">Эта учетная запись уже существует</string>
-    <string name="next">Далее</string>
-    <string name="server_info_session_established">Текущий сеанс установлен</string>
-    <string name="additional_information">Дополнительная информация</string>
-    <string name="skip">Пропустить</string>
-    <string name="disable_notifications">Отключить уведомления</string>
-    <string name="disable_notifications_for_this_conversation">Отключить уведомления для текущей беседы</string>
-    <string name="notifications_disabled">Уведомления отключены</string>
-    <string name="enable">Включить</string>
-    <string name="conference_requires_password">Конференция требует авторизации</string>
-    <string name="enter_password">Введите пароль</string>
-    <string name="missing_presence_updates">Обновления присутствия недоступны</string>
-    <string name="request_presence_updates">Пожалуйста, прежде запросите обновления присутствия у вашего собеседника.\n\n<small>Эта информация будет использоваться для определения того, каким клиентом(ами) пользуетя ваш собеседник.</small></string>
-    <string name="request_now">Запросить сейчас</string>
-    <string name="delete_fingerprint">Удалить Контрольную Сумму</string>
-    <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данную контрольную сумму?</string>
-    <string name="ignore">Отменить</string>
-    <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
-    <string name="pref_encryption_settings">Настройки шифрования</string>
-    <string name="pref_force_encryption">Обязательное сквозное шифрование</string>
-    <string name="pref_force_encryption_summary">Всегда отправлять сообщения зашифрованными (за исключением конференций)</string>
-    <string name="pref_dont_save_encrypted">Не сохранять зашифрованные сообщения</string>
-    <string name="pref_dont_save_encrypted_summary">Внимание: Это может привести к потере сообщений</string>
-    <string name="pref_expert_options">Расширенные настройки</string>
-    <string name="pref_expert_options_summary">Пожалуйста, будьте осторожны с данными настройками</string>
-    <string name="pref_use_larger_font">Увеличить размер шрифта</string>
-    <string name="pref_use_larger_font_summary">Установите больший размер шрифта по всей программе</string>
-    <string name="pref_use_send_button_to_indicate_status">Использовать кнопку-индикатор</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
-
+  <string name="action_settings">Настройки</string>
+  <string name="action_add">Новая беседа</string>
+  <string name="action_accounts">Управление аккаунтами</string>
+  <string name="action_end_conversation">Закончить текущую беседу</string>
+  <string name="action_contact_details">Сведения о контакте</string>
+  <string name="action_muc_details">Сведения о конференции</string>
+  <string name="action_secure">Защищенная беседа</string>
+  <string name="action_add_account">Добавить аккаунт</string>
+  <string name="action_edit_contact">Редактировать контакт</string>
+  <string name="action_add_phone_book">Добавить в телефонную книгу</string>
+  <string name="action_delete_contact">Удалить из списка</string>
+  <string name="title_activity_manage_accounts">Управление Аккаунтами</string>
+  <string name="title_activity_settings">Настройки</string>
+  <string name="title_activity_conference_details">Сведения о Конференции</string>
+  <string name="title_activity_contact_details">Сведения о Контакте</string>
+  <string name="title_activity_sharewith">Поделиться</string>
+  <string name="title_activity_start_conversation">Начать беседу</string>
+  <string name="title_activity_choose_contact">Выберите собеседника</string>
+  <string name="just_now">только что</string>
+  <string name="minute_ago">1 минуту назад</string>
+  <string name="minutes_ago">%d мин. назад</string>
+  <string name="unread_conversations">непрочитанных сообщений</string>
+  <string name="sending">отправка…</string>
+  <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите…</string>
+  <string name="nick_in_use">Имя уже используется</string>
+  <string name="admin">Администратор</string>
+  <string name="owner">Владелец</string>
+  <string name="moderator">Модератор</string>
+  <string name="participant">Участник</string>
+  <string name="visitor">Посетитель</string>
+  <string name="remove_contact_text">Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены.</string>
+  <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой будут сохранены</string>
+  <string name="register_account">Создать новый аккаунт на сервере</string>
+  <string name="share_with">Поделиться с</string>
+  <string name="start_conversation">Начать беседу</string>
+  <string name="invite_contact">Пригласить собеседника</string>
+  <string name="contacts">Контакты</string>
+  <string name="cancel">Отмена</string>
+  <string name="add">Добавить</string>
+  <string name="edit">Редактировать</string>
+  <string name="delete">Удалить</string>
+  <string name="save">Сохранить</string>
+  <string name="ok">ОК</string>
+  <string name="crash_report_title">Conversations был неожиданно остановлен</string>
+  <string name="crash_report_message">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить программу, поддерживая дальнейшее развитие программы\n<b>Предупреждение:</b>Отчет об ошибке будет отправлен разработчику, используя ваш аккаунт XMPP.</string>
+  <string name="send_now">Отправить сейчас</string>
+  <string name="send_never">Больше не спрашивать</string>
+  <string name="problem_connecting_to_account">Не удается подключиться к аккаунту</string>
+  <string name="problem_connecting_to_accounts">Не удается подключиться к аккаунтам</string>
+  <string name="touch_to_fix">Нажмите здесь, чтобы настроить свои аккаунты</string>
+  <string name="attach_file">Прикрепить файл</string>
+  <string name="not_in_roster">Контакт не находится в вашем списке. Хотите добавить его?</string>
+  <string name="add_contact">Добавить контакт</string>
+  <string name="send_failed">доставка не удалась</string>
+  <string name="send_rejected">отклонено</string>
+  <string name="preparing_image">Подготовка изображения к передаче</string>
+  <string name="action_clear_history">Очистить историю</string>
+  <string name="clear_conversation_history">Очистить историю</string>
+  <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
+  <string name="delete_messages">Удалить сообщения</string>
+  <string name="also_end_conversation">Завершить беседу</string>
+  <string name="choose_presence">Укажите статус для контакта</string>
+  <string name="send_plain_text_message">Отправить незашифрованное текстовое сообщение</string>
+  <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
+  <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
+  <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
+  <string name="download_image">Загрузить изображение</string>
+  <string name="send_unencrypted">Отправить в незашифрованном виде</string>
+  <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
+  <string name="openkeychain_required">Установите OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations использует стороннее приложение под названием <b>OpenKeychain</b> для шифрования и расшифрования сообщений и управления открытыми ключами.\nПрограмма OpenKeychain распространяется под лицензией GPLv3 и доступна для загрузки через F-Droid или Google Play.\n\n<small>(Потребуется перезапуск Conversations после установки.)</small></string>
+  <string name="restart">Перезапуск</string>
+  <string name="install">Установка</string>
+  <string name="offering">предложение…</string>
+  <string name="waiting">ожидание…</string>
+  <string name="no_pgp_key">Нет OpenPGP ключа</string>
+  <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что удаленный пользователь не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите удаленного пользователя тоже установить OpenPGP.</small></string>
+  <string name="no_pgp_keys">Нет OpenPGP ключей</string>
+  <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщения, потому что удаленные пользователи не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите удаленных пользователей тоже установить OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
+  <string name="pref_general">Общие</string>
+  <string name="pref_xmpp_resource">Название ресурса</string>
+  <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
+  <string name="pref_accept_files">Принимать файлы</string>
+  <string name="pref_accept_files_summary">Автоматический прием файлов…</string>
+  <string name="pref_notification_settings">Настройки Уведомлений</string>
+  <string name="pref_notifications">Уведомление</string>
+  <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
+  <string name="pref_vibrate">Вибрация</string>
+  <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
+  <string name="pref_sound">Звуковой сигнал</string>
+  <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
+  <string name="pref_conference_notifications">Уведомления конференции</string>
+  <string name="pref_conference_notifications_summary">Всегда сообщать при получении нового сообщения в конференции</string>
+  <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
+  <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
+  <string name="pref_advanced_options">Дополнительные параметры</string>
+  <string name="pref_never_send_crash">Отчеты об ошибках</string>
+  <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
+  <string name="pref_confirm_messages">Отчеты о получении</string>
+  <string name="pref_confirm_messages_summary">Разрешить уведомлять отправителя, когда вы получили и прочитали сообщение</string>
+  <string name="pref_ui_options">Параметры интерфейса</string>
+  <string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
+  <string name="error_decrypting_file">Ошибка расшифровки файла</string>
+  <string name="accept">Принять</string>
+  <string name="error">Произошла ошибка</string>
+  <string name="pref_grant_presence_updates">Предоставлять обновления</string>
+  <string name="pref_grant_presence_updates_summary">Разрешить и запрашивать статус присутствия для созданных вами контактов</string>
+  <string name="subscriptions">Подписки</string>
+  <string name="your_account">Ваш аккаунт</string>
+  <string name="keys">Ключи</string>
+  <string name="send_presence_updates">Анонсировать статус присутствия</string>
+  <string name="receive_presence_updates">Получать обновления статусов присутствия</string>
+  <string name="ask_for_presence_updates">Запрашивать обновления статусов присутствия</string>
+  <string name="attach_choose_picture">Выберите изображение</string>
+  <string name="attach_take_picture">Снимите изображение</string>
+  <string name="preemptively_grant">Удовлетворять запросы на подписки</string>
+  <string name="error_not_an_image_file">Выбранный файл не является изображением</string>
+  <string name="error_compressing_image">Ошибка при преобразовании изображения</string>
+  <string name="error_file_not_found">Файл не найден</string>
+  <string name="error_io_exception">Общая ошибка ввода/вывода. Возможно, на устройстве недостаточно свободного места?</string>
+  <string name="error_security_exception_during_image_copy">Приложение, которое было использовано для выбора изображения не имеет достаточных прав для чтения файла.\n\n<small>Используйте другой файловый менеджер, чтобы выбрать изображение</small></string>
+  <string name="account_status_unknown">Неизвестен</string>
+  <string name="account_status_disabled">Временно отключен</string>
+  <string name="account_status_online">В сети</string>
+  <string name="account_status_connecting">Соединение\u2026</string>
+  <string name="account_status_offline">Не в сети</string>
+  <string name="account_status_unauthorized">Неавторизован</string>
+  <string name="account_status_not_found">Сервер не найден</string>
+  <string name="account_status_no_internet">Нет подключения к сети</string>
+  <string name="account_status_regis_fail">Регистрация не удалась</string>
+  <string name="account_status_regis_conflict">Имя пользователя уже используется</string>
+  <string name="account_status_regis_success">Регистрация завершена</string>
+  <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string>
+  <string name="encryption_choice_none">Без шифрования</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Редактировать аккаунт</string>
+  <string name="mgmt_account_delete">Удалить</string>
+  <string name="mgmt_account_disable">Отключить</string>
+  <string name="mgmt_account_publish_avatar">Разместить аватар</string>
+  <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
+  <string name="mgmt_account_enable">Включить</string>
+  <string name="mgmt_account_are_you_sure">Вы уверены?</string>
+  <string name="mgmt_account_delete_confirm_text">Если вы удалите свой аккаунт, вся ваша история будет потеряна</string>
+  <string name="attach_record_voice">Запись голоса</string>
+  <string name="account_settings_jabber_id">JID (Джаббер ID)</string>
+  <string name="account_settings_password">Пароль</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">Подтвердите пароль</string>
+  <string name="password">Пароль</string>
+  <string name="confirm_password">Подтвердите пароль</string>
+  <string name="passwords_do_not_match">Пароли не совпадают</string>
+  <string name="invalid_jid">Недопустимый JID (Джаббер ID)</string>
+  <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
+  <string name="add_phone_book_text">Вы хотите добавить %s в свою телефонную книгу?</string>
+  <string name="contact_status_online">в сети</string>
+  <string name="contact_status_free_to_chat">свободен для общения</string>
+  <string name="contact_status_away">скоро буду</string>
+  <string name="contact_status_extended_away">буду не скоро</string>
+  <string name="contact_status_do_not_disturb">не беспокоить</string>
+  <string name="contact_status_offline">не в сети</string>
+  <string name="muc_details_conference">Конференция</string>
+  <string name="muc_details_other_members">Другие участники</string>
+  <string name="server_info_carbon_messages">Дублирование сообщений</string>
+  <string name="server_info_stream_management">Управление потоками</string>
+  <string name="server_info_pep">XEP-0163: PEP (Аватары)</string>
+  <string name="server_info_available">доступен</string>
+  <string name="server_info_unavailable">недоступен</string>
+  <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
+  <string name="last_seen_now">Присутствие: только что</string>
+  <string name="last_seen_min">Присутствие: 1 минуту назад</string>
+  <string name="last_seen_mins">Присутствие: %d мин. назад</string>
+  <string name="last_seen_hour">Присутствие: 1 час назад</string>
+  <string name="last_seen_hours">Присутствие: %d час. назад</string>
+  <string name="last_seen_day">Присутствие: 1 день назад</string>
+  <string name="last_seen_days">Присутствие: %d дн. назад</string>
+  <string name="never_seen">Никогда</string>
+  <string name="install_openkeychain">Зашифрованное сообщение. Пожалуйста, установите OpenKeychain для дешифрования.</string>
+  <string name="unknown_otr_fingerprint">Неизвестная контрольная сумма криптографического протокола OTR</string>
+  <string name="openpgp_messages_found">Найдены OpenPGP зашифрованые сообщения</string>
+  <string name="reception_failed">Прием не удался</string>
+  <string name="your_fingerprint">Контрольная сумма</string>
+  <string name="otr_fingerprint">OTR контрольная сумма</string>
+  <string name="verify">Подтвердить</string>
+  <string name="decrypt">Дешифровать</string>
+  <string name="conferences">Конференции</string>
+  <string name="search">Поиск</string>
+  <string name="create_contact">Создать контакт</string>
+  <string name="join_conference">Присоединиться к конференции</string>
+  <string name="delete_contact">Удалить Контакт</string>
+  <string name="view_contact_details">Посмотреть данные контакта</string>
+  <string name="create">Создать</string>
+  <string name="contact_already_exists">Контакт уже существует</string>
+  <string name="join">Присоединиться</string>
+  <string name="conference_address">Адрес конференции</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">Сохранить закладку</string>
+  <string name="delete_bookmark">Удалить закладку</string>
+  <string name="bookmark_already_exists">Такая закладка уже существует</string>
+  <string name="you">Вы</string>
+  <string name="action_edit_subject">Редактировать тему конференции</string>
+  <string name="conference_not_found">Конференция не найдена</string>
+  <string name="leave">Покинуть</string>
+  <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
+  <string name="add_back">Добавить в ответ</string>
+  <string name="contact_has_read_up_to_this_point">%s прочит. сообщ. до этого момента</string>
+  <string name="publish">Опубликовать</string>
+  <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
+  <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
+  <string name="publishing">Установка…</string>
+  <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
+  <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
+  <string name="error_saving_avatar">Не удалось сохранить аватар</string>
+  <string name="or_long_press_for_default">(Или долгое прикосновение, чтобы вернуть значения по умолчанию)</string>
+  <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
+  <string name="private_message">Отправить личное сообщение для %s</string>
+  <string name="private_message_to">отправить %s</string>
+  <string name="send_private_message_to">Отправить личное сообщение для %s</string>
+  <string name="connect">Подключиться</string>
+  <string name="account_already_exists">Эта учетная запись уже существует</string>
+  <string name="next">Далее</string>
+  <string name="server_info_session_established">Текущий сеанс установлен</string>
+  <string name="additional_information">Дополнительная информация</string>
+  <string name="skip">Пропустить</string>
+  <string name="disable_notifications">Отключить уведомления</string>
+  <string name="disable_notifications_for_this_conversation">Отключить уведомления для текущей беседы</string>
+  <string name="notifications_disabled">Уведомления отключены</string>
+  <string name="enable">Включить</string>
+  <string name="conference_requires_password">Конференция требует авторизации</string>
+  <string name="enter_password">Введите пароль</string>
+  <string name="missing_presence_updates">Обновления присутствия недоступны</string>
+  <string name="request_presence_updates">Пожалуйста, прежде запросите обновления присутствия у вашего собеседника.\n\n<small>Эта информация будет использоваться для определения того, каким клиентом(ами) пользуетя ваш собеседник.</small></string>
+  <string name="request_now">Запросить сейчас</string>
+  <string name="delete_fingerprint">Удалить Контрольную Сумму</string>
+  <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данную контрольную сумму?</string>
+  <string name="ignore">Отменить</string>
+  <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
+  <string name="pref_encryption_settings">Настройки шифрования</string>
+  <string name="pref_force_encryption">Обязательное сквозное шифрование</string>
+  <string name="pref_force_encryption_summary">Всегда отправлять сообщения зашифрованными (за исключением конференций)</string>
+  <string name="pref_dont_save_encrypted">Не сохранять зашифрованные сообщения</string>
+  <string name="pref_dont_save_encrypted_summary">Внимание: Это может привести к потере сообщений</string>
+  <string name="pref_expert_options">Расширенные настройки</string>
+  <string name="pref_expert_options_summary">Пожалуйста, будьте осторожны с данными настройками</string>
+  <string name="pref_use_larger_font">Увеличить размер шрифта</string>
+  <string name="pref_use_larger_font_summary">Установите больший размер шрифта по всей программе</string>
+  <string name="pref_use_send_button_to_indicate_status">Использовать кнопку-индикатор</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..78622fa5
--- /dev/null
+++ b/src/main/res/values-sk/strings.xml
@@ -0,0 +1,420 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Nastavenia</string>
+  <string name="action_add">Nová konverzácia</string>
+  <string name="action_accounts">Nastavenie účtov</string>
+  <string name="action_end_conversation">Ukončiť túto konverzáciu</string>
+  <string name="action_contact_details">Detaily kontaktu</string>
+  <string name="action_muc_details">Detaily skupinovej konverzácie</string>
+  <string name="action_secure">Zabezpečená konverzácia</string>
+  <string name="action_add_account">Pridať účet</string>
+  <string name="action_edit_contact">Upraviť meno</string>
+  <string name="action_add_phone_book">Pridať do telefónneho zoznamu</string>
+  <string name="action_delete_contact">Vymazať zo zoznamu</string>
+  <string name="action_block_contact">Zablokovať kontakt</string>
+  <string name="action_unblock_contact">Odblokovať kontakt</string>
+  <string name="action_block_domain">Zablokovať doménu</string>
+  <string name="action_unblock_domain">Odblokovať doménu</string>
+  <string name="title_activity_manage_accounts">Nastavenie účtov</string>
+  <string name="title_activity_settings">Nastavenia</string>
+  <string name="title_activity_conference_details">Detaily skupinovej konverzácie</string>
+  <string name="title_activity_contact_details">Detaily kontaktu</string>
+  <string name="title_activity_sharewith">Zdieľať s konverzáciou</string>
+  <string name="title_activity_start_conversation">Začať konverzáciu</string>
+  <string name="title_activity_choose_contact">Vybrať kontakt</string>
+  <string name="title_activity_block_list">Zablokovať zoznam</string>
+  <string name="just_now">práve teraz</string>
+  <string name="minute_ago">pred 1 minútou</string>
+  <string name="minutes_ago">pred %d minútami</string>
+  <string name="unread_conversations">neprečítané konverzácie</string>
+  <string name="sending">odosielam…</string>
+  <string name="encrypted_message">Dešifrujem správu. Čakajte, prosím…</string>
+  <string name="nick_in_use">Prezývka už existuje</string>
+  <string name="admin">Administrátor</string>
+  <string name="owner">Vlastník</string>
+  <string name="moderator">Moderátor</string>
+  <string name="participant">Účastník</string>
+  <string name="visitor">Návštevník</string>
+  <string name="remove_contact_text">Chceli by ste odstrániť %s zo svojho zoznamu? Konverzácie spojené s týmto kontaktom nebudú odstránené.</string>
+  <string name="block_contact_text">Chceli by ste zablokovať  prijímanie správ od %s? </string>
+  <string name="unblock_contact_text">Chceli by ste odblokovať  %s a povoliť prijímanie správ?</string>
+  <string name="block_domain_text">Zablokovať všetky kontakty od %s?</string>
+  <string name="unblock_domain_text">Odblokovať všetky kontakty od %s?</string>
+  <string name="contact_blocked">Kontakt zablokovaný</string>
+  <string name="remove_bookmark_text">Chcete odstrániť %s zo záložiek? Konverzácie spojené s touto záložkou nebudú odstránené.</string>
+  <string name="register_account">Registrovať nový účet na serveri</string>
+  <string name="change_password_on_server">Zmeniť heslo na serveri</string>
+  <string name="share_with">Zdieľať s</string>
+  <string name="start_conversation">Začať konverzáciu</string>
+  <string name="invite_contact">Pozvať kontakt</string>
+  <string name="contacts">Kontakty</string>
+  <string name="cancel">Zrušiť</string>
+  <string name="set">Nastaviť</string>
+  <string name="add">Pridať</string>
+  <string name="edit">Upraviť</string>
+  <string name="delete">Vymazať</string>
+  <string name="block">Zablokovať</string>
+  <string name="unblock">Odblokovať</string>
+  <string name="save">Uložiť</string>
+  <string name="ok">OK</string>
+  <string name="crash_report_title">Aplikácia Conversations prestala reagovať</string>
+  <string name="crash_report_message">Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations\n<b>Varovanie:</b> Toto použije nastavený XMPP účet na zaslanie detailov vývojárom.</string>
+  <string name="send_now">Poslať teraz</string>
+  <string name="send_never">Nepýtať sa znova</string>
+  <string name="problem_connecting_to_account">Pripojenie k účtu zlyhalo</string>
+  <string name="problem_connecting_to_accounts">Pripojenie k viacerým účtom zlyhalo</string>
+  <string name="touch_to_fix">Pre nastavenie účtov kliknite tu</string>
+  <string name="attach_file">Priložiť súbor</string>
+  <string name="not_in_roster">Kontakt sa nenachádza v zozname. Chcete ho pridať?</string>
+  <string name="add_contact">Pridať kontakt</string>
+  <string name="send_failed">doručenie zlyhalo</string>
+  <string name="send_rejected">zamietnuté</string>
+  <string name="preparing_image">Pripravujem obrázok na prenos</string>
+  <string name="action_clear_history">Vymazať históriu</string>
+  <string name="clear_conversation_history">Vymazať históriu konverzácií</string>
+  <string name="clear_histor_msg">Chcete vymazať všetky správy v tejto konverzácii?\n\n<b>Varovanie:</b> Toto neovplyvní správy uložené v iných zariadeniach alebo serveroch.</string>
+  <string name="delete_messages">Vymazať správy</string>
+  <string name="also_end_conversation">Následne ukončiť aj túto konverzáciu</string>
+  <string name="choose_presence">Vybrať aktualizáciu stavu pre kontakt</string>
+  <string name="send_plain_text_message">Poslať textovú správu</string>
+  <string name="send_otr_message">Poslať OTR šifrovanú správu</string>
+  <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
+  <string name="your_nick_has_been_changed">Prezývka sa zmenila</string>
+  <string name="download_image">Stiahnuť obrázok</string>
+  <string name="send_unencrypted">Poslať nešifrované</string>
+  <string name="decryption_failed">Zašifrovanie zlyhalo. Možno nemáte správny privátny kľúč.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations využíva aplikáciu tretej strany, <b>OpenKeychain</b>, k šifrovaniu a dešifrovaniu správ a k správe verejných kľúčov.\n\nOpenKeychain má licenciu pod GPLv3 a je dostupný na F-Droid a Google Play.\n\n<small>(Po inštalácii, prosím, reštartujte aplikáciu Conversations.)</small></string>
+  <string name="restart">Reštartovať</string>
+  <string name="install">Inštalovať</string>
+  <string name="offering">ponúka…</string>
+  <string name="waiting">čakám…</string>
+  <string name="no_pgp_key">Nenašiel sa žiadny OpenPGP kľúč</string>
+  <string name="contact_has_no_pgp_key">Nie je možné zašifrovať správu v aplikácii Conversations, pretože druhá strana neoznamuje svoj verejný kľúč.\n\n<small>Požiadajte svoj kontakt o nastavenie OpenPGP.</small></string>
+  <string name="no_pgp_keys">Nenašli sa žiadne OpenPGP kľúče</string>
+  <string name="contacts_have_no_pgp_keys">Nie je možné zašifrovať správy v aplikácii Conversations, pretože kontakty neoznamujú svoj verejný kľúč.\n\n<small>Požiadajte svoje kontakty o nastavenie OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Bola prijatá šifrovaná správa. Kliknite pre dešifrovanie a prečítanie.</i></string>
+  <string name="pref_general">Všeobecné</string>
+  <string name="pref_xmpp_resource">XMPP zdroj</string>
+  <string name="pref_xmpp_resource_summary">Meno, ktorým sa tento klient identifikuje</string>
+  <string name="pref_accept_files">Prijať súbory</string>
+  <string name="pref_accept_files_summary">Automaticky prijať súbory menšie ako…</string>
+  <string name="pref_notification_settings">Nastavenia upozornení</string>
+  <string name="pref_notifications">Upozornenia</string>
+  <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string>
+  <string name="pref_vibrate">Vibrovať</string>
+  <string name="pref_vibrate_summary">Vibrovať pri prijatí novej správy</string>
+  <string name="pref_sound">Zvuk</string>
+  <string name="pref_sound_summary">Prehrať zvuk spolu s upozornením</string>
+  <string name="pref_conference_notifications">Upozornenia pri skupinovej konverzácii</string>
+  <string name="pref_conference_notifications_summary">Vždy upozorniť pri novej konferenčnej správe, nie len ak je zvýraznená</string>
+  <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string>
+  <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string>
+  <string name="pref_advanced_options">Pokročilé nastavenia</string>
+  <string name="pref_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string>
+  <string name="pref_never_send_crash_summary">Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations</string>
+  <string name="pref_confirm_messages">Potvrdzovať správy</string>
+  <string name="pref_confirm_messages_summary">Oznámi kontaktom, že správa bola prijatá a prečítaná</string>
+  <string name="pref_ui_options">Možnosti UI</string>
+  <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
+  <string name="error_decrypting_file">I/O chyba dešifrovania súboru</string>
+  <string name="accept">Prijať</string>
+  <string name="error">Došlo k chybe</string>
+  <string name="pref_grant_presence_updates">Povoliť aktualizáciu stavu</string>
+  <string name="pref_grant_presence_updates_summary">Aktívne povoliť a žiadať o zasielanie zmien stavu pre vytvorené kontakty</string>
+  <string name="subscriptions">Odbery</string>
+  <string name="your_account">Váš účet</string>
+  <string name="keys">Kľúče</string>
+  <string name="send_presence_updates">Zasielať zmeny stavu</string>
+  <string name="receive_presence_updates">Prijímať zmeny stavu</string>
+  <string name="ask_for_presence_updates">Požiadať o zmeny stavu</string>
+  <string name="attach_choose_picture">Vybrať obrázok</string>
+  <string name="attach_take_picture">Odfotiť</string>
+  <string name="preemptively_grant">Aktívne povoliť vyžiadanie zmeny stavu</string>
+  <string name="error_not_an_image_file">Vybraný súbor nie je obrázok</string>
+  <string name="error_compressing_image">Chyba pri konverzii obrázkového súboru</string>
+  <string name="error_file_not_found">Súbor sa nenašiel</string>
+  <string name="error_io_exception">Všeobecná I/O chyba. Možno už nie je voľné miesto?</string>
+  <string name="error_security_exception_during_image_copy">Aplikácia zvolená pre výber obrázkov nepovolila prečítanie súboru.\n\n<small>Skúste použiť iného správcu súborov pre výber obrázkov</small></string>
+  <string name="account_status_unknown">Neznámy</string>
+  <string name="account_status_disabled">Dočasne vypnutý</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_connecting">Pripájam\u2026</string>
+  <string name="account_status_offline">Offline</string>
+  <string name="account_status_unauthorized">Neschválený</string>
+  <string name="account_status_not_found">Server sa nenašiel</string>
+  <string name="account_status_no_internet">Žiadne pripojenie</string>
+  <string name="account_status_regis_fail">Registrácia zlyhala</string>
+  <string name="account_status_regis_conflict">Užívateľské meno už existuje</string>
+  <string name="account_status_regis_success">Registrácia ukončená</string>
+  <string name="account_status_regis_not_sup">Server nepodporuje registráciu</string>
+  <string name="account_status_security_error">Bezpečnostná chyba</string>
+  <string name="account_status_incompatible_server">Nekompatibilný server</string>
+  <string name="encryption_choice_none">Čistý text</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Upraviť účet</string>
+  <string name="mgmt_account_delete">Vymazať účet</string>
+  <string name="mgmt_account_disable">Dočasne vypnúť</string>
+  <string name="mgmt_account_publish_avatar">Zverejniť avatar</string>
+  <string name="mgmt_account_publish_pgp">Zverejniť OpenPGP kľúč</string>
+  <string name="mgmt_account_enable">Povoliť účet</string>
+  <string name="mgmt_account_are_you_sure">Ste si istý?</string>
+  <string name="mgmt_account_delete_confirm_text">Ak vymažete svoj účet, stratí sa celá história konverzácií</string>
+  <string name="attach_record_voice">Nahrať hlas</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">Heslo</string>
+  <string name="account_settings_example_jabber_id">meno@priklad.com</string>
+  <string name="account_settings_confirm_password">Potvrdiť heslo</string>
+  <string name="password">Heslo</string>
+  <string name="confirm_password">Potvrdiť heslo</string>
+  <string name="passwords_do_not_match">Heslá nezodpovedajú</string>
+  <string name="invalid_jid">Toto nie je platné Jabber ID</string>
+  <string name="error_out_of_memory">Nedostatok pamäti. Obrázok je príliš veľký</string>
+  <string name="add_phone_book_text">Chcete pridať %s do svojho telefónneho zoznamu?</string>
+  <string name="contact_status_online">online</string>
+  <string name="contact_status_free_to_chat">dostupný pre chat</string>
+  <string name="contact_status_away">preč</string>
+  <string name="contact_status_extended_away">preč na dlhšiu dobu</string>
+  <string name="contact_status_do_not_disturb">nerušiť</string>
+  <string name="contact_status_offline">offline</string>
+  <string name="muc_details_conference">Skupinová konverzácia</string>
+  <string name="muc_details_other_members">Ostatní členovia</string>
+  <string name="server_info_show_more">Informácie o serveri</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">dostupný</string>
+  <string name="server_info_unavailable">nedostupný</string>
+  <string name="missing_public_keys">Chýba oznámenie o verejnom kľúči</string>
+  <string name="last_seen_now">práve prihlásený</string>
+  <string name="last_seen_min">naposledy prihlásený pred 1 minútou</string>
+  <string name="last_seen_mins">naposledy prihlásený pred %d minútami</string>
+  <string name="last_seen_hour">naposledy prihlásený pred 1 hodinou</string>
+  <string name="last_seen_hours">naposledy prihlásený pred %d hodinami</string>
+  <string name="last_seen_day">naposledy prihlásený pred 1 dňom</string>
+  <string name="last_seen_days">naposledy prihlásený pred %d dňami</string>
+  <string name="never_seen">nebol nikdy prihlásený</string>
+  <string name="install_openkeychain">Šifrovaná správa. Nainštalujte, prosím, OpenKeychain pre dešifrovanie.</string>
+  <string name="unknown_otr_fingerprint">Neznámy OTR identifikátor</string>
+  <string name="openpgp_messages_found">Našla sa OpenPGP šifrovaná správa</string>
+  <string name="reception_failed">Príjem zlyhal</string>
+  <string name="your_fingerprint">Váš identifikátor</string>
+  <string name="otr_fingerprint">OTR identifikátor</string>
+  <string name="verify">Overiť</string>
+  <string name="decrypt">Dešifrovať</string>
+  <string name="conferences">Skupinové konverzácie</string>
+  <string name="search">Hľadať</string>
+  <string name="create_contact">Vytvoriť kontakt</string>
+  <string name="join_conference">Pripojiť ku skupinovej konverzácii</string>
+  <string name="delete_contact">Vymazať kontakt</string>
+  <string name="view_contact_details">Zobraziť detaily kontaktu</string>
+  <string name="block_contact">Zablokovať kontakt</string>
+  <string name="unblock_contact">Odblokovať kontakt</string>
+  <string name="create">Vytvoriť</string>
+  <string name="contact_already_exists">Kontakt už existuje</string>
+  <string name="join">Vstúpiť</string>
+  <string name="conference_address">Adresa</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">Uložiť ako záložku</string>
+  <string name="delete_bookmark">Vymazať záložku</string>
+  <string name="bookmark_already_exists">Táto záložka už existuje</string>
+  <string name="you">Ty</string>
+  <string name="action_edit_subject">Upraviť meno skupinovej konverzácie</string>
+  <string name="conference_not_found">Skupinová konverzácia sa nenašla</string>
+  <string name="leave">Odísť</string>
+  <string name="contact_added_you">Kontakt pridaný do zoznamu</string>
+  <string name="add_back">Znova pridať</string>
+  <string name="contact_has_read_up_to_this_point">%s dočítal až potiaľ</string>
+  <string name="publish">Zverejniť</string>
+  <string name="touch_to_choose_picture">Kliknúť na avatar a vybrať obrázok z galérie</string>
+  <string name="publish_avatar_explanation">Pozor: Každý s povolením vidieť zmeny stavu má prístup k tomuto obrázku.</string>
+  <string name="publishing">Zverejňujem…</string>
+  <string name="error_publish_avatar_server_reject">Server odmietol toto zverejnenie</string>
+  <string name="error_publish_avatar_converting">Pri konverzii obrázku sa niečo nepodarilo</string>
+  <string name="error_saving_avatar">Nepodarilo sa uložiť avatar na disk</string>
+  <string name="or_long_press_for_default">(Dlho podržať pre obnovenie pôvodného stavu)</string>
+  <string name="error_publish_avatar_no_server_support">Váš server nepodporuje zverejňovanie avatarov</string>
+  <string name="private_message">súkromná správa</string>
+  <string name="private_message_to">pre %s</string>
+  <string name="send_private_message_to">Odoslať súkromnú správu %s</string>
+  <string name="connect">Pripojiť </string>
+  <string name="account_already_exists">Tento účet už existuje</string>
+  <string name="next">Ďalší</string>
+  <string name="server_info_session_established">Súčasné stretnutie vytvorené</string>
+  <string name="additional_information">Doplňujúce informácie</string>
+  <string name="skip">Preskočiť</string>
+  <string name="disable_notifications">Vypnúť upozornenia</string>
+  <string name="disable_notifications_for_this_conversation">Vypnúť upozornenia pre túto konverzáciu</string>
+  <string name="notifications_disabled">Upozornenia sú vypnuté</string>
+  <string name="enable">Povoliť</string>
+  <string name="conference_requires_password">Skupinová konverzácia vyžaduje heslo</string>
+  <string name="enter_password">Vložiť heslo</string>
+  <string name="missing_presence_updates">Kontakt nezasiela informácie o zmene stavu</string>
+  <string name="request_presence_updates">Najskôr si, prosím, vyžiadajte povolenie o zasielanie zmien stavu kontaktu.\n\n<small>To bude následne použité na identifikáciu aplikácie, ktorú kontakt používa.</small></string>
+  <string name="request_now">Ihneď vyžiadať</string>
+  <string name="delete_fingerprint">Vymazať identifikátor</string>
+  <string name="sure_delete_fingerprint">Naozaj chcete vymazať tento identifikátor?</string>
+  <string name="ignore">Ignorovať</string>
+  <string name="without_mutual_presence_updates"><b>Varovanie:</b> Odoslanie bez povolenia zmien stavu môže spôsobiť nečakané problémy na obidvoch stranách.\n\n<small>Prejdi na detaily kontaktu pre overenie povolenia o zmenách stavu.</small></string>
+  <string name="pref_encryption_settings">Nastavenie šifrovania</string>
+  <string name="pref_force_encryption">Vynútiť šifrovanie</string>
+  <string name="pref_force_encryption_summary">Vždy zasielať šifrované správy (okrem skupinových konverzácií)</string>
+  <string name="pref_dont_save_encrypted">Neukladať šifrované správy</string>
+  <string name="pref_dont_save_encrypted_summary">Varovanie: Toto môže viesť k strate správ</string>
+  <string name="pref_expert_options">Expertné nastavenia</string>
+  <string name="pref_expert_options_summary">S týmto narábajte veľmi opatrne, prosím</string>
+  <string name="title_activity_about">O Conversations</string>
+  <string name="pref_about_conversations_summary">Informácie o tvorbe a licencii</string>
+  <string name="title_pref_quiet_hours">Tichý režim</string>
+  <string name="title_pref_quiet_hours_start_time">Čas začiatku</string>
+  <string name="title_pref_quiet_hours_end_time">Čas konca</string>
+  <string name="title_pref_enable_quiet_hours">Povoliť tichý režim</string>
+  <string name="pref_quiet_hours_summary">Upozornenia budú počas tichého režimu stlmené</string>
+  <string name="pref_use_larger_font">Zväčšiť veľkosť písma</string>
+  <string name="pref_use_larger_font_summary">Použiť väčšie písmo v celej aplikácii</string>
+  <string name="pref_use_send_button_to_indicate_status">Tlačidlo pre odoslanie zobrazuje stav</string>
+  <string name="pref_use_indicate_received">Požadovať oznámenie o prijatí</string>
+  <string name="pref_use_indicate_received_summary">Prijaté správy budú označené zelenou kvačkou. Toto nemusí vždy plne fungovať.</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Vyfarbiť tlačidlo pre odoslanie na určenie stavu kontaktu</string>
+  <string name="pref_expert_options_other">Ďalší</string>
+  <string name="pref_conference_name">Meno skupinovej konverzácie</string>
+  <string name="pref_conference_name_summary">Pre identifikáciu skupinových konverzácií použiť tému miestnosti namiesto jeho JID</string>
+  <string name="toast_message_otr_fingerprint">OTR identifikátor skopírovaný do schránky!</string>
+  <string name="conference_banned">Máte zakázaný vstup do tejto konverzácie</string>
+  <string name="conference_members_only">Táto konverzácia je iba pre členov</string>
+  <string name="conference_kicked">Vyčlenili vás z tejto konverzácie</string>
+  <string name="using_account">Používa sa účet %s</string>
+  <string name="checking_image">Overuje sa obrázok na serveri HTTP</string>
+  <string name="image_file_deleted">Súbor s obrázkom bol vymazaný</string>
+  <string name="not_connected_try_again">Nie ste pripojený. Skúste to neskôr</string>
+  <string name="check_image_filesize">Overiť veľkosť obrázku</string>
+  <string name="message_options">Možnosti správy</string>
+  <string name="copy_text">Skopírovať text</string>
+  <string name="copy_original_url">Skopírovať originálny URL</string>
+  <string name="send_again">Poslať znova</string>
+  <string name="image_url">Obrázok URL</string>
+  <string name="message_text">Textová správa</string>
+  <string name="url_copied_to_clipboard">URL skopírovaný do schránky</string>
+  <string name="message_copied_to_clipboard">Správa skopírovaná do schránky</string>
+  <string name="image_transmission_failed">Zlyhal prenos obrázku</string>
+  <string name="scan_qr_code">Skenovať kód QR</string>
+  <string name="show_qr_code">Zobraziť kód QR</string>
+  <string name="show_block_list">Zobraziť zoznam blokovaných</string>
+  <string name="account_details">Detaily účtu</string>
+  <string name="verify_otr">Overiť OTR</string>
+  <string name="remote_fingerprint">Vzdialený identifikátor</string>
+  <string name="scan">skenovať</string>
+  <string name="or_touch_phones">(alebo dotykové telefóny)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Pomôcka alebo Otázka</string>
+  <string name="shared_secret_secret">Spoločné tajomstvo</string>
+  <string name="confirm">Potvrdiť</string>
+  <string name="in_progress">V procese</string>
+  <string name="respond">Odpovedať</string>
+  <string name="failed">Zlyhal</string>
+  <string name="secrets_do_not_match">Tajomstvá nezodpovedajú</string>
+  <string name="try_again">Skúste znova</string>
+  <string name="finish">Ukončiť</string>
+  <string name="verified">Overený!</string>
+  <string name="smp_requested">Kontakt žiadal SMP overenie </string>
+  <string name="no_otr_session_found">Našlo sa neplatné OTR stretnutie!</string>
+  <string name="conversations_foreground_service">Konverzácie</string>
+  <string name="pref_keep_foreground_service">Ponechať službu v prvom pláne</string>
+  <string name="pref_keep_foreground_service_summary">Zamedzí operačnému systému ukončiť pripojenie </string>
+  <string name="choose_file">Vybrať súbor</string>
+  <string name="receiving_x_file">Prijímam %1$s (%2$d%% ukončený)</string>
+  <string name="download_x_file">Stiahnuť %s</string>
+  <string name="file">súbor</string>
+  <string name="open_x_file">Otvoriť %s</string>
+  <string name="sending_file">posielam (%1$d%% ukončený)</string>
+  <string name="preparing_file">Pripravujem súbor na prenos </string>
+  <string name="x_file_offered_for_download">%s ponúknutý na stiahnutie </string>
+  <string name="cancel_transmission">Zrušiť prenos</string>
+  <string name="file_transmission_failed">prenos súboru zlyhal</string>
+  <string name="file_deleted">Súbor bol vymazaný</string>
+  <string name="no_application_found_to_open_file">Nenašla sa žiadna aplikácia na otvorenie súboru</string>
+  <string name="could_not_verify_fingerprint">Nepodarilo sa overiť identifikátor</string>
+  <string name="manually_verify">Overiť manuálne</string>
+  <string name="are_you_sure_verify_fingerprint">Ste si istý, že chcete overiť OTR identifikátor vašich kontaktov? </string>
+  <string name="pref_show_dynamic_tags">Zobraziť dynamické etikety</string>
+  <string name="pref_show_dynamic_tags_summary">Zobraziť etikety na čítanie pod kontakty</string>
+  <string name="enable_notifications">Povoliť upozornenia</string>
+  <string name="conference_with">Vytvoriť skupinovú konverzáciu s…</string>
+  <string name="no_conference_server_found">Nenašiel sa server na skupinovú konverzáciu</string>
+  <string name="conference_creation_failed">Vytvorenie skupinovej konverzácie zlyhalo!</string>
+  <string name="conference_created">Skupinová konverzácia vytvorená!</string>
+  <string name="secret_accepted">Tajomstvo prijaté!</string>
+  <string name="reset">Vymazať</string>
+  <string name="account_image_description">Avatar účtu</string>
+  <string name="copy_otr_clipboard_description">Skopírovať OTR identifikátor do schránky</string>
+  <string name="fetching_history_from_server">Načítať históriu zo serveru</string>
+  <string name="no_more_history_on_server">Na serveri nie je žiadna ďalšia história</string>
+  <string name="updating">Aktualizujem...</string>
+  <string name="password_changed">Heslo zmenené!</string>
+  <string name="could_not_change_password">Nepodarilo sa zmeniť heslo</string>
+  <string name="otr_session_not_started">Poslať správu pre spustenie šifrovaného chatu</string>
+  <string name="ask_question">Položiť otázku</string>
+  <string name="smp_explain_question">Ak máte vy a váš kontakt spoločné tajomstvo, ktoré nikto iný nepozná (napríklad spoločný vtip alebo čo ste mali na obed na vašom poslednom stretnutí), môžete ho použiť na overenie vzájomných identifikátorov.\n\nZadáte pomôcku alebo otázku a kontakt na ňu správne odpovie. </string>
+  <string name="smp_explain_answer">Váš kontakt by chcel overiť váš identifikátor pomocou spoločného tajomstva. Váš kontakt zadal nasledujúcu pomôcku alebo otázku týkajúcu sa tajomstva. </string>
+  <string name="shared_secret_hint_should_not_be_empty">Vaša pomôcka by nemala byť prázdna</string>
+  <string name="shared_secret_can_not_be_empty">Vaše spoločné tajomstvo nemôže byť prázdne</string>
+  <string name="manual_verification_explanation">Opatrne porovnajte identifikátor zobrazený dole s identifikátorom vášho kontaktu.\nNa ich výmenu môžte použiť akúkoľvek bezpečnú formu komunikácie ako napríklad šifrovaný e-mail alebo telefonát.</string>
+  <string name="change_password">Zmeniť heslo</string>
+  <string name="current_password">Aktuálne heslo</string>
+  <string name="new_password">Nové heslo</string>
+  <string name="password_should_not_be_empty">Heslo nesmie byť prázdne</string>
+  <string name="enable_all_accounts">Povoliť všetky účty</string>
+  <string name="disable_all_accounts">Vypnúť všetky účty</string>
+  <string name="perform_action_with">Uskutočniť akciu s</string>
+  <string name="no_affiliation">Nepridružený</string>
+  <string name="no_role">Bez úlohy</string>
+  <string name="outcast">Vylúčený</string>
+  <string name="member">Člen</string>
+  <string name="advanced_mode">Pokročilý režim</string>
+  <string name="grant_membership">Povoliť členstvo</string>
+  <string name="remove_membership">Odobrať členstvo</string>
+  <string name="grant_admin_privileges">Povoliť administrátorské výsady</string>
+  <string name="remove_admin_privileges">Odobrať administrátorské výsady</string>
+  <string name="remove_from_room">Odstrániť zo skupinovej konverzácie</string>
+  <string name="could_not_change_affiliation">Nepodarilo sa zmeniť pripojenie užívateľa %s</string>
+  <string name="ban_from_conference">Vylúčiť zo skupinovej konverzácie</string>
+  <string name="removing_from_public_conference">Pokúšate sa vyhodiť %s z verejnej konverzácie. Dá sa to iba definitívnym vylúčením daného používateľa.</string>
+  <string name="ban_now">Vylúčiť</string>
+  <string name="could_not_change_role">Nepodarilo sa zmeniť úlohu %s</string>
+  <string name="public_conference">Verejne prístupná skupinová konverzácia</string>
+  <string name="private_conference">Súkromná konverzácia iba pre členov</string>
+  <string name="conference_options">Možnosti skupinovej konverzácie</string>
+  <string name="members_only">Súkromný (Iba pre členov)</string>
+  <string name="non_anonymous">Neanonymný</string>
+  <string name="modified_conference_options">Možnosti skupinovej konverzácie nastavené!</string>
+  <string name="could_not_modify_conference_options">Nepodarilo sa nastaviť možnosti skupinovej konverzácie</string>
+  <string name="never">Nikdy</string>
+  <string name="thirty_minutes">30 minút</string>
+  <string name="one_hour">1 hodina</string>
+  <string name="two_hours">2 hodiny</string>
+  <string name="eight_hours">8 hodín</string>
+  <string name="until_further_notice">Až do odvolania</string>
+  <string name="pref_input_options">Možnosti zadávaní</string>
+  <string name="pref_enter_is_send">Enter odosiela</string>
+  <string name="pref_enter_is_send_summary">Použiť klávesu enter na odoslanie správy</string>
+  <string name="pref_display_enter_key">Zobraziť klávesu enter</string>
+  <string name="pref_display_enter_key_summary">Zmeniť klávesu s emotikonmi na klávesu enter</string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">obrázok</string>
+  <string name="pdf_document">dokument PDF</string>
+  <string name="apk">Android App</string>
+  <string name="vcard">Kontakt</string>
+  <string name="received_x_file">Prijatý %s</string>
+  <string name="disable_foreground_service">Vypnúť prvoplánovú službu</string>
+  <string name="touch_to_open_conversations">Kliknite na spustenie Conversations</string>
+  <string name="avatar_has_been_published">Avatar sa publikoval!</string>
+  <string name="sending_x_file">Posielam %s</string>
+  <string name="offering_x_file">Ponúkam %s</string>
+  <string name="hide_offline">Skryť neprihlásených</string>
+</resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000..874c206d
--- /dev/null
+++ b/src/main/res/values-sr/strings.xml
@@ -0,0 +1,406 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="action_settings">Поставке</string>
+  <string name="action_add">Нова преписка</string>
+  <string name="action_accounts">Управљај налозима</string>
+  <string name="action_end_conversation">Окончај преписку</string>
+  <string name="action_contact_details">Детаљи контакта</string>
+  <string name="action_muc_details">Детаљи конференције</string>
+  <string name="action_secure">Безбедна преписка</string>
+  <string name="action_add_account">Додај налог</string>
+  <string name="action_edit_contact">Уреди име</string>
+  <string name="action_add_phone_book">Додај у именик</string>
+  <string name="action_delete_contact">Обриши са списка контаката</string>
+  <string name="action_block_contact">Блокирај контакт</string>
+  <string name="action_unblock_contact">Одблокирај контакт</string>
+  <string name="action_block_domain">Блокирај домен</string>
+  <string name="action_unblock_domain">Одблокирај домен</string>
+  <string name="title_activity_manage_accounts">Управљање налозима</string>
+  <string name="title_activity_settings">Поставке</string>
+  <string name="title_activity_conference_details">Детаљи конференције</string>
+  <string name="title_activity_contact_details">Детаљи контакта</string>
+  <string name="title_activity_sharewith">Подели са преписком</string>
+  <string name="title_activity_start_conversation">Почни преписку</string>
+  <string name="title_activity_choose_contact">Изабери контакт</string>
+  <string name="title_activity_block_list">Списак блокираних</string>
+  <string name="just_now">управо сад</string>
+  <string name="minute_ago">пре минут</string>
+  <string name="minutes_ago">пре %d минута</string>
+  <string name="unread_conversations">непрочитане преписке</string>
+  <string name="sending">шаљем…</string>
+  <string name="encrypted_message">Дешифрујем поруку, сачекајте…</string>
+  <string name="nick_in_use">Надимак је већ у употреби</string>
+  <string name="admin">Администратор</string>
+  <string name="owner">Власник</string>
+  <string name="moderator">Модератор</string>
+  <string name="participant">Учесник</string>
+  <string name="visitor">Посетилац</string>
+  <string name="remove_contact_text">Желите ли да уклоните %s са вашег списка контаката? Преписка са овим контактом неће бити уклоњена.</string>
+  <string name="block_contact_text">Желите ли да блокирате поруке од %s?</string>
+  <string name="unblock_contact_text">Желите ли да одблокирате %s и допустите им да вам шаљу поруке?</string>
+  <string name="block_domain_text">Блокирати све контакте од %s?</string>
+  <string name="unblock_domain_text">Одблокирати све контакте од %s?</string>
+  <string name="contact_blocked">Контакт блокиран</string>
+  <string name="remove_bookmark_text">Желите ли да уклоните %s са обележивача? Преписка са овим контактом неће бити уклоњена.</string>
+  <string name="register_account">Региструј нови налог на серверу</string>
+  <string name="change_password_on_server">Промени лозинку на серверу</string>
+  <string name="share_with">Подели са…</string>
+  <string name="start_conversation">Почни преписку</string>
+  <string name="invite_contact">Позови контакта</string>
+  <string name="contacts">Контакти</string>
+  <string name="cancel">Одустани</string>
+  <string name="set">Постави</string>
+  <string name="add">Додај</string>
+  <string name="edit">Уреди</string>
+  <string name="delete">Обриши</string>
+  <string name="block">Блокирај</string>
+  <string name="unblock">Одблокирај</string>
+  <string name="save">Сачувај</string>
+  <string name="ok">У реду</string>
+  <string name="crash_report_title">Конверзација се срушила</string>
+  <string name="crash_report_message">Слањем контратрага помажете текући развој Конверзације\n<b>Упозорење:</b> Ово ће да искористи ваш ИксМПП налог за слање контратрага програмеру.</string>
+  <string name="send_now">Пошаљи одмах</string>
+  <string name="send_never">Не питај више</string>
+  <string name="problem_connecting_to_account">Не могу да се повежем са налогом</string>
+  <string name="problem_connecting_to_accounts">Не могу да се повежем са више налога</string>
+  <string name="touch_to_fix">Додирните овде да бисте управљали вашим налозима</string>
+  <string name="attach_file">Приложи фајл</string>
+  <string name="not_in_roster">Контакт није на вашем списку контаката. Желите ли да га додате?</string>
+  <string name="add_contact">Додај контакт</string>
+  <string name="send_failed">испорука није успела</string>
+  <string name="send_rejected">одбијено</string>
+  <string name="preparing_image">Припремам слику за пренос</string>
+  <string name="action_clear_history">Очисти историјат</string>
+  <string name="clear_conversation_history">Брисање историјата преписки</string>
+  <string name="clear_histor_msg">Желите ли да обришете све поруке ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
+  <string name="delete_messages">Обриши поруке</string>
+  <string name="also_end_conversation">Окончај ову преписку након тога</string>
+  <string name="choose_presence">Избор присутности за контакта</string>
+  <string name="send_plain_text_message">Пошаљи обичну текстуалну поруку</string>
+  <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
+  <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
+  <string name="your_nick_has_been_changed">Ваш надимак је промењен</string>
+  <string name="download_image">Преузми слику</string>
+  <string name="send_unencrypted">Пошаљи нешифровано</string>
+  <string name="decryption_failed">Шифровање није успело. Можда немате одговарајући лични кључ.</string>
+  <string name="openkeychain_required">Отворени кључарник</string>
+  <string name="openkeychain_required_long">Конверзација користи апликацију <b>Отворени кључарник</b> за шифровање и дешифровање порука и управљање вашим јавним кључевима.\n\nОтворени кључарник је лиценциран под ГПЛв3 и доступан је на Ф-дроиду у Гугловој Плеј продавници.\n\n<small>(Поново покрените Конверзацију након тога.)</small></string>
+  <string name="restart">Поново покрени</string>
+  <string name="install">Инсталирај</string>
+  <string name="offering">нудим…</string>
+  <string name="waiting">чекам…</string>
+  <string name="no_pgp_key">Нема ОпенПГП кључа</string>
+  <string name="contact_has_no_pgp_key">Конверзација није могла да шифрује ваше поруке јер ваш контакт не објављује свој јавни кључ.\n\n<small>Замолите вашег контакта да постави ОпенПГП.</small></string>
+  <string name="no_pgp_keys">Нема ОпенПГП кључева</string>
+  <string name="contacts_have_no_pgp_keys">Конверзација није могла да шифрује ваше поруке јер ваши контакти не објављују свој јавни кључ.\n\n<small>Замолите ваше контакте да поставе ОпенПГП.</small></string>
+  <string name="encrypted_message_received"><i>Примљена је шифрована порука. Додирните за дешифровање и приказ.</i></string>
+  <string name="pref_general">Опште</string>
+  <string name="pref_xmpp_resource">ИксМПП ресурс</string>
+  <string name="pref_xmpp_resource_summary">Име са којим се овај клијент идентификује</string>
+  <string name="pref_accept_files">Прихваћај фајлове</string>
+  <string name="pref_accept_files_summary">Аутоматски прихваћај фајлове мање од…</string>
+  <string name="pref_notification_settings">Поставке обавештења</string>
+  <string name="pref_notifications">Обавештења</string>
+  <string name="pref_notifications_summary">Обавести кад стигне нова порука</string>
+  <string name="pref_vibrate">Вибрирај</string>
+  <string name="pref_vibrate_summary">Вибрирај кад стигне нова порука</string>
+  <string name="pref_sound">Звук</string>
+  <string name="pref_sound_summary">Звуци обавештења</string>
+  <string name="pref_conference_notifications">Обавештења конференције</string>
+  <string name="pref_conference_notifications_summary">Увек обавести кад нова порука у конференцији стигне уместо само кад је означена</string>
+  <string name="pref_notification_grace_period">Период одгоде обавештења</string>
+  <string name="pref_notification_grace_period_summary">Онемогући обавештења на кратко по примању карбон копије</string>
+  <string name="pref_advanced_options">Напредне поставке</string>
+  <string name="pref_never_send_crash">Никад не шаљи извештаје о паду</string>
+  <string name="pref_never_send_crash_summary">Слањем контратрага помажете текући развој Конверзације</string>
+  <string name="pref_confirm_messages">Потврди поруке</string>
+  <string name="pref_confirm_messages_summary">Обзнаните контакту кад примите и прочитате поруку</string>
+  <string name="pref_ui_options">Поставке сучеља</string>
+  <string name="openpgp_error">Отворени кључарник је пријавио грешку</string>
+  <string name="error_decrypting_file">У/И грешка дешифровања фајла</string>
+  <string name="accept">Прихвати</string>
+  <string name="error">Десила се грешка</string>
+  <string name="pref_grant_presence_updates">Дозволи ажурирања присутности</string>
+  <string name="pref_grant_presence_updates_summary">Унапред дозволи и питај за претплату на присутност за контакте које направите</string>
+  <string name="subscriptions">Претплате</string>
+  <string name="your_account">Ваш налог</string>
+  <string name="keys">Кључеви</string>
+  <string name="send_presence_updates">Шаљи ажурирања присутности</string>
+  <string name="receive_presence_updates">Примај ажурирања присутности</string>
+  <string name="ask_for_presence_updates">Питај за ажурирања присутности</string>
+  <string name="attach_choose_picture">Изабери слику</string>
+  <string name="attach_take_picture">Фотографиши</string>
+  <string name="preemptively_grant">Унапред дозволи захтев за претплатом</string>
+  <string name="error_not_an_image_file">Изабрани фајл није слика</string>
+  <string name="error_compressing_image">Грешка прекодирања фајла слике</string>
+  <string name="error_file_not_found">Фајл није нађен</string>
+  <string name="error_io_exception">Општа У/И грешка. Можда вам је нестало простора у складишту?</string>
+  <string name="error_security_exception_during_image_copy">Апликација којом сте изабрали ову слику није дала довољне дозволе за читање фајла.\n\n<small>Користите други менаџер фајлова да изаберете слику</small></string>
+  <string name="account_status_unknown">Непознато</string>
+  <string name="account_status_disabled">Привремено онемогућен</string>
+  <string name="account_status_online">На вези</string>
+  <string name="account_status_connecting">Повезивање\u2026</string>
+  <string name="account_status_offline">Ван везе</string>
+  <string name="account_status_unauthorized">Неовлашћен</string>
+  <string name="account_status_not_found">Сервер није нађен</string>
+  <string name="account_status_no_internet">Нема везе</string>
+  <string name="account_status_regis_fail">Регистрација није успела</string>
+  <string name="account_status_regis_conflict">Корисничко име је већ у употреби</string>
+  <string name="account_status_regis_success">Регистрација завршена</string>
+  <string name="account_status_regis_not_sup">Сервер не подржава регистрацију</string>
+  <string name="account_status_security_error">Безбедносна грешка</string>
+  <string name="account_status_incompatible_server">Некомпатибилан сервер</string>
+  <string name="encryption_choice_none">Обичан текст</string>
+  <string name="encryption_choice_otr">ОТР</string>
+  <string name="encryption_choice_pgp">ОпенПГП</string>
+  <string name="mgmt_account_edit">Уреди налог</string>
+  <string name="mgmt_account_delete">Обриши налог</string>
+  <string name="mgmt_account_disable">Привремено онемогући</string>
+  <string name="mgmt_account_publish_avatar">Објави аватар</string>
+  <string name="mgmt_account_publish_pgp">Објави ОпенПГП јавни кључ</string>
+  <string name="mgmt_account_enable">Омогући налог</string>
+  <string name="mgmt_account_are_you_sure">Да ли сте сигурни?</string>
+  <string name="mgmt_account_delete_confirm_text">Ако обришете ваш налог изгубићете сав историјат преписке</string>
+  <string name="attach_record_voice">Сними глас</string>
+  <string name="account_settings_jabber_id">Џабер ИД</string>
+  <string name="account_settings_password">Лозинка</string>
+  <string name="account_settings_example_jabber_id">korisnickoime@primer.com</string>
+  <string name="account_settings_confirm_password">Потврди лозинку</string>
+  <string name="password">Лозинка</string>
+  <string name="confirm_password">Потврди лозинку</string>
+  <string name="passwords_do_not_match">Лозинке се не поклапају</string>
+  <string name="invalid_jid">Ово није исправан Џабер ИД</string>
+  <string name="error_out_of_memory">Нестало меморије. Слика је превелика</string>
+  <string name="add_phone_book_text">Желите ли да додате %s у именик вашег телефона?</string>
+  <string name="contact_status_online">на вези</string>
+  <string name="contact_status_free_to_chat">слободан за ћаскање</string>
+  <string name="contact_status_away">одсутан</string>
+  <string name="contact_status_extended_away">продужено одсутан</string>
+  <string name="contact_status_do_not_disturb">не узнемиравај</string>
+  <string name="contact_status_offline">ван везе</string>
+  <string name="muc_details_conference">Конференција</string>
+  <string name="muc_details_other_members">Остали чланови</string>
+  <string name="server_info_show_more">Подаци о серверу</string>
+  <string name="server_info_mam">XEP-0313: МАМ</string>
+  <string name="server_info_carbon_messages">XEP-0280: копије порука</string>
+  <string name="server_info_csi">XEP-0352: индикација стања клијента</string>
+  <string name="server_info_blocking">XEP-0191: наредба блокирања</string>
+  <string name="server_info_roster_version">XEP-0237: верзионисање ростера</string>
+  <string name="server_info_stream_management">XEP-0198: менаџмент тока</string>
+  <string name="server_info_pep">XEP-0163: ПЕП (аватари)</string>
+  <string name="server_info_available">доступан</string>
+  <string name="server_info_unavailable">недоступан</string>
+  <string name="missing_public_keys">Недостају објаве јавног кључа</string>
+  <string name="last_seen_now">виђен/а мало пре</string>
+  <string name="last_seen_min">виђен/а пре минут</string>
+  <string name="last_seen_mins">виђен/а пре %d минута</string>
+  <string name="last_seen_hour">виђен/а пре сата</string>
+  <string name="last_seen_hours">виђен/а пре %d сати</string>
+  <string name="last_seen_day">виђен/а пре један дан</string>
+  <string name="last_seen_days">виђен/а пре %d дана</string>
+  <string name="never_seen">никад виђен/а</string>
+  <string name="install_openkeychain">Шифрована порука. Инсталирајте Отворени кључарник да бисте је дешифровали.</string>
+  <string name="unknown_otr_fingerprint">Непознат ОТР отисак</string>
+  <string name="openpgp_messages_found">Нађене ОпенПГП шифроване поруке</string>
+  <string name="reception_failed">Примање није успело</string>
+  <string name="your_fingerprint">Ваш отисак</string>
+  <string name="otr_fingerprint">ОТР отисак</string>
+  <string name="verify">Овери</string>
+  <string name="decrypt">Дешифруј</string>
+  <string name="conferences">Конференције</string>
+  <string name="search">Тражи</string>
+  <string name="create_contact">Направи контакт</string>
+  <string name="join_conference">Придружи се конференцији</string>
+  <string name="delete_contact">Обриши контакт</string>
+  <string name="view_contact_details">Прикажи детаље контакта</string>
+  <string name="block_contact">Блокирај контакт</string>
+  <string name="unblock_contact">Одблокирај контакт</string>
+  <string name="create">Направи</string>
+  <string name="contact_already_exists">Контакт већ постоји</string>
+  <string name="join">Придружи се</string>
+  <string name="conference_address">Адреса конференције</string>
+  <string name="conference_address_example">soba@konferencija.primer.com</string>
+  <string name="save_as_bookmark">Сачувај као обележивач</string>
+  <string name="delete_bookmark">Обриши обележивач</string>
+  <string name="bookmark_already_exists">Овај обележивач већ постоји</string>
+  <string name="you">Ви</string>
+  <string name="action_edit_subject">Уреди предмет конференције</string>
+  <string name="conference_not_found">Конференција није нађена</string>
+  <string name="leave">Напусти</string>
+  <string name="contact_added_you">Контакт вас је додао на списак контаката</string>
+  <string name="add_back">Додај га</string>
+  <string name="contact_has_read_up_to_this_point">%s је прочитао довде</string>
+  <string name="publish">Објави</string>
+  <string name="touch_to_choose_picture">Додирните аватар да изаберете слику из галерије</string>
+  <string name="publish_avatar_explanation">Имајте на уму: Свима који су претплаћени на ваше ажурирање присутности биће дозвољено да виде ову слику.</string>
+  <string name="publishing">Објављујем…</string>
+  <string name="error_publish_avatar_server_reject">Сервер је одбио вашу објаву</string>
+  <string name="error_publish_avatar_converting">Дошло је до грешке при прекодирању слике</string>
+  <string name="error_saving_avatar">Нисам могао да сачувам аватар на диск</string>
+  <string name="or_long_press_for_default">(или притисните дуго да вратите подразумевани)</string>
+  <string name="error_publish_avatar_no_server_support">Ваш сервер не подржава објаву аватара</string>
+  <string name="private_message">шапну</string>
+  <string name="private_message_to">за %s</string>
+  <string name="send_private_message_to">Пошаљи личну поруку за %s</string>
+  <string name="connect">Повежи</string>
+  <string name="account_already_exists">Овај налог већ постоји</string>
+  <string name="next">Следеће</string>
+  <string name="server_info_session_established">Текућа сесија успостављена</string>
+  <string name="additional_information">Додатни подаци</string>
+  <string name="skip">Прескочи</string>
+  <string name="disable_notifications">Онемогући обавештења</string>
+  <string name="disable_notifications_for_this_conversation">Онемогући обавештења за ову преписку</string>
+  <string name="notifications_disabled">Обавештења су онемогућена</string>
+  <string name="enable">Омогући</string>
+  <string name="conference_requires_password">Конференција захтева лозинку</string>
+  <string name="enter_password">Унесите лозинку</string>
+  <string name="missing_presence_updates">Нема ажуриране присутности од контакта</string>
+  <string name="request_presence_updates">Најпре захтевајте ажурирање присутности од вашег контакта.\n\n<small>Ово ће омогућити да се одреди којег клијента ваш контакт користи.</small></string>
+  <string name="request_now">Захтевај одмах</string>
+  <string name="delete_fingerprint">Обриши отисак</string>
+  <string name="sure_delete_fingerprint">Желите ли заиста да обришете овај отисак?</string>
+  <string name="ignore">Занемари</string>
+  <string name="without_mutual_presence_updates"><b>Упозорење:</b> Слање овога без узајамних ажурирања присутности би могло да узрокује неочекиване проблеме.\n\n<small>Идите на детаље контакта да бисте проверили претплате на присутности.</small></string>
+  <string name="pref_encryption_settings">Поставке шифровања</string>
+  <string name="pref_force_encryption">Присили крај-на-крај шифровање</string>
+  <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за конференције)</string>
+  <string name="pref_dont_save_encrypted">Не успремај шифроване поруке</string>
+  <string name="pref_dont_save_encrypted_summary">Упозорење: Ово може да доведе до губитка порука</string>
+  <string name="pref_expert_options">Опције за стручњаке</string>
+  <string name="pref_expert_options_summary">Будите пажљиви са овим</string>
+  <string name="title_activity_about">О Конверзацији</string>
+  <string name="pref_about_conversations_summary">Подаци о издању и лиценци</string>
+  <string name="title_pref_quiet_hours">Тихи сати</string>
+  <string name="title_pref_quiet_hours_start_time">Време почетка</string>
+  <string name="title_pref_quiet_hours_end_time">Време завршетка</string>
+  <string name="title_pref_enable_quiet_hours">Омогући тихе сате</string>
+  <string name="pref_quiet_hours_summary">Обавештења ће бити утишана за време тихих сати</string>
+  <string name="pref_use_larger_font">Повећај величину фонта</string>
+  <string name="pref_use_larger_font_summary">Користи веће величине фонта за читаву апликацију</string>
+  <string name="pref_use_send_button_to_indicate_status">Дугме слања показује стање</string>
+  <string name="pref_use_indicate_received">Захтевај потврде порука</string>
+  <string name="pref_use_indicate_received_summary">Означи примљене поруке зеленом квачицом, ако је подржано</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Боја дугмета за слање показује стање контакта</string>
+  <string name="pref_expert_options_other">Остало</string>
+  <string name="pref_conference_name">Име конференције</string>
+  <string name="pref_conference_name_summary">Предмет собе уместо ЈИД-а идентификује конференцију</string>
+  <string name="toast_message_otr_fingerprint">ОТР отисак копиран на клипборд!</string>
+  <string name="conference_banned">Забрањени сте на овој конференцији</string>
+  <string name="conference_members_only">Ова конференција је само за чланове</string>
+  <string name="conference_kicked">Шутнути сте из ове конференције</string>
+  <string name="using_account">преко налога %s</string>
+  <string name="checking_image">Проверавам слику на ХТТП домаћину</string>
+  <string name="image_file_deleted">Ова слика је обрисана</string>
+  <string name="not_connected_try_again">Нисте повезани. Покушајте поново касније</string>
+  <string name="check_image_filesize">Провери величину слике</string>
+  <string name="message_options">Опције поруке</string>
+  <string name="copy_text">Копирај текст</string>
+  <string name="copy_original_url">Копирај изворни УРЛ</string>
+  <string name="send_again">Пошаљи поново</string>
+  <string name="image_url">УРЛ слике</string>
+  <string name="message_text">Текст поруке</string>
+  <string name="url_copied_to_clipboard">УРЛ је копиран на клипборд</string>
+  <string name="message_copied_to_clipboard">Порука је копирана на клипборд</string>
+  <string name="image_transmission_failed">Пренос слике није успео</string>
+  <string name="scan_qr_code">Очитај бар-код</string>
+  <string name="show_qr_code">Прикажи бар-код</string>
+  <string name="show_block_list">Прикажи списак блокираних</string>
+  <string name="account_details">Детаљи налога</string>
+  <string name="verify_otr">Овери ОТР</string>
+  <string name="remote_fingerprint">Отисак удаљеног</string>
+  <string name="scan">очитај</string>
+  <string name="or_touch_phones">(или додирните телефоне)</string>
+  <string name="smp">Социјалистички милионер протокол</string>
+  <string name="shared_secret_hint">Наговештај или питање</string>
+  <string name="shared_secret_secret">Заједничка тајна</string>
+  <string name="confirm">Потврди</string>
+  <string name="in_progress">У току</string>
+  <string name="respond">Одговори</string>
+  <string name="failed">Неуспех</string>
+  <string name="secrets_do_not_match">Тајне се не поклапају</string>
+  <string name="try_again">Покушај поново</string>
+  <string name="finish">Заврши</string>
+  <string name="verified">Оверено!</string>
+  <string name="smp_requested">Контакт захтева СМП оверавање</string>
+  <string name="no_otr_session_found">Нема исправне ОТР сесије!</string>
+  <string name="conversations_foreground_service">Конверзација</string>
+  <string name="pref_keep_foreground_service">Држи сервис у првом плану</string>
+  <string name="pref_keep_foreground_service_summary">Спречава оперативни систем да прекине вашу везу</string>
+  <string name="choose_file">Изабери фајл</string>
+  <string name="receiving_x_file">Примам %1$s (%2$d%% завршено)</string>
+  <string name="download_x_file">Преузми %s</string>
+  <string name="open_x_file">Отвори %s</string>
+  <string name="sending_file">шаљем (%1$d%% завршено)</string>
+  <string name="preparing_file">Припремам фајл за пренос</string>
+  <string name="x_file_offered_for_download">%s понуђен за преузимање</string>
+  <string name="cancel_transmission">Прекини пренос</string>
+  <string name="file_transmission_failed">пренос фајла није успео</string>
+  <string name="file_deleted">Фајл је обрисан</string>
+  <string name="no_application_found_to_open_file">Нема апликације која може да отвори фајл</string>
+  <string name="could_not_verify_fingerprint">Не могу да оверим отисак</string>
+  <string name="manually_verify">Овери ручно</string>
+  <string name="are_you_sure_verify_fingerprint">Желите ли заиста да оверите ОТР отисак вашег контакта?</string>
+  <string name="pref_show_dynamic_tags">Прикажи динамичке ознаке</string>
+  <string name="pref_show_dynamic_tags_summary">Приказ ознака испод контаката</string>
+  <string name="enable_notifications">Омогући обавештења</string>
+  <string name="conference_with">Направи конференцију са…</string>
+  <string name="no_conference_server_found">Сервер конференције није нађен</string>
+  <string name="conference_creation_failed">Прављење конференције није успело!</string>
+  <string name="conference_created">Конференција направљена!</string>
+  <string name="secret_accepted">Тајна прихваћена!</string>
+  <string name="reset">Ресетуј</string>
+  <string name="account_image_description">Аватар налога</string>
+  <string name="copy_otr_clipboard_description">Копирај ОТР отисак на клипборд</string>
+  <string name="fetching_history_from_server">Добављам историјат са сервера</string>
+  <string name="no_more_history_on_server">Нема више историјата на серверу</string>
+  <string name="updating">Ажурирам…</string>
+  <string name="password_changed">Лозинка промењена!</string>
+  <string name="could_not_change_password">Нисам могао да променим лозинку</string>
+  <string name="otr_session_not_started">Пошаљите поруку да бисте започели шифровано ћаскање</string>
+  <string name="ask_question">Постави питање</string>
+  <string name="smp_explain_question">Ако ви и ваш контакт имате заједничку тајну коју нико не зна (као што је лична шала или једноставно шта сте јели последњи пут кад сте се срели) можете употребити ту тајну да међусобно оверите отиске.\n\nВи дате наговештај или питање за вашег контакта који ће дати одговор (осетљив на велика и мала слова).</string>
+  <string name="smp_explain_answer">Ваш контакт жели да овери ваш отисак изазивајући вас заједничком тајном. Ваш контакт је дао следећи наговештај или питање за ту тајну.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Наговештај не би смео бити празан</string>
+  <string name="shared_secret_can_not_be_empty">Заједничка тајна не може бити празна</string>
+  <string name="manual_verification_explanation">Пажљиво упоредите отисак испод са отиском вашег контакта.\nМожете да употребите било који поверљив облик комуникације као што је шифрована е-пошта или позив телефоном да бисте разменили отиске.</string>
+  <string name="change_password">Промени лозинку</string>
+  <string name="current_password">Текућа лозинка</string>
+  <string name="new_password">Нова лозинка</string>
+  <string name="password_should_not_be_empty">Лозинка не може бити празна</string>
+  <string name="enable_all_accounts">Омогући све налоге</string>
+  <string name="disable_all_accounts">Онемогући све налоге</string>
+  <string name="perform_action_with">Изврши радњу са</string>
+  <string name="no_affiliation">Без припадности</string>
+  <string name="no_role">Без улоге</string>
+  <string name="outcast">Изгнаник</string>
+  <string name="member">Члан</string>
+  <string name="advanced_mode">Напредни режим</string>
+  <string name="grant_membership">Одобри чланство</string>
+  <string name="remove_membership">Опозови чланство</string>
+  <string name="grant_admin_privileges">Одобри админ. привилегије</string>
+  <string name="remove_admin_privileges">Одобри админ. привилегије</string>
+  <string name="remove_from_room">Уклони из конференције</string>
+  <string name="could_not_change_affiliation">Не могу да изменим припадност за %s</string>
+  <string name="ban_from_conference">Забрани са конференције</string>
+  <string name="removing_from_public_conference">Покушавате да уклоните %s са јавне конференције. Једини начин да то урадите је да забраните тог корисника заувек.</string>
+  <string name="ban_now">Забрани одмах</string>
+  <string name="could_not_change_role">Не могу да изменим улогу за %s</string>
+  <string name="public_conference">Јавно доступна конференција</string>
+  <string name="private_conference">Лична, само за чланове конференција</string>
+  <string name="conference_options">Опције конференције</string>
+  <string name="members_only">Лична (само чланови)</string>
+  <string name="non_anonymous">Неанонимна</string>
+  <string name="modified_conference_options">Поставке конференције измењене!</string>
+  <string name="could_not_modify_conference_options">Не могу да изменим поставке конференције</string>
+  <string name="never">никад</string>
+  <string name="thirty_minutes">30 минута</string>
+  <string name="one_hour">1 сат</string>
+  <string name="two_hours">2 сата</string>
+  <string name="eight_hours">8 сати</string>
+  <string name="until_further_notice">до даљњег</string>
+  <string name="pref_input_options">Опције уноса</string>
+  <string name="pref_enter_is_send">Ентер шаље</string>
+  <string name="pref_enter_is_send_summary">Користи Ентер тастер за слање порука</string>
+  <string name="pdf_document">ПДФ документ</string>
+  <string name="received_x_file">Примљено %s</string>
+</resources>
diff --git a/src/main/res/values-sv/arrays.xml b/src/main/res/values-sv/arrays.xml
deleted file mode 100644
index 890e2915..00000000
--- a/src/main/res/values-sv/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>Mobile</item>
-        <item>Phone</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>aldrig</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 2c3cb9c3..f1eb6acf 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -1,259 +1,420 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">Inställningar</string>
-    <string name="action_add">Ny konversation</string>
-    <string name="action_accounts">Kontoinställningar</string>
-    <string name="action_end_conversation">Avsluta denna konversation</string>
-    <string name="action_contact_details">Kontaktdetaljer</string>
-    <string name="action_muc_details">Konferensdetaljer</string>
-    <string name="action_secure">Skyddad konversation</string>
-    <string name="action_add_account">Lägg till konto</string>
-    <string name="action_edit_contact">Ändra namn</string>
-    <string name="action_add_phone_book">Lägg till i telefonbok</string>
-    <string name="action_delete_contact">Ta bort kontakt</string>
-    <string name="title_activity_manage_accounts">Hantera konton</string>
-    <string name="title_activity_settings">Inställningar</string>
-    <string name="title_activity_conference_details">Konferensdetaljer</string>
-    <string name="title_activity_contact_details">Kontaktdetaljer</string>
-    <string name="title_activity_sharewith">Dela med konversation</string>
-    <string name="title_activity_start_conversation">Starta konversation</string>
-    <string name="title_activity_choose_contact">Välj kontakt</string>
-    <string name="just_now">just nu</string>
-    <string name="minute_ago">1 min sedan</string>
-    <string name="minutes_ago">%d min sedan</string>
-    <string name="unread_conversations">olästa konversationer</string>
-    <string name="sending">skickar&#8230;</string>
-    <string name="encrypted_message">Avkrypterar meddelande. Vänta&#8230;</string>
-    <string name="nick_in_use">Nick används redan</string>
-    <string name="admin">Admin</string>
-    <string name="owner">Ägare</string>
-    <string name="moderator">Moderator</string>
-    <string name="participant">Deltagare</string>
-    <string name="visitor">Besökare</string>
-    <string name="remove_contact_text">Vill du ta bort %s från din kontaktlista? Konversationer associerade med denna kontakt kommer inte tas bort.</string>
-    <string name="remove_bookmark_text">Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort.</string>
-    <string name="register_account">Registrera nytt konto på servern</string>
-    <string name="share_with">Dela med</string>
-    <string name="start_conversation">Starta konversation</string>
-    <string name="invite_contact">Bjud in kontakt</string>
-    <string name="contacts">Kontakter</string>
-    <string name="cancel">Avbryt</string>
-    <string name="add">Lägg till</string>
-    <string name="edit">Ändra</string>
-    <string name="delete">Ta bort</string>
-    <string name="save">Spara</string>
-    <string name="ok">Ok</string>
-    <string name="crash_report_title">Conversations har kraschat</string>
-    <string name="crash_report_message">Genom att skicka in stack traces hjälper du utvecklarna av Conversations\n<b>Varning:</b> Detta använder ditt XMPP konto för att skicka informationen till utvecklarna.</string>
-    <string name="send_now">Skicka nu</string>
-    <string name="send_never">Fråga aldrig igen</string>
-    <string name="problem_connecting_to_account">Kan inte ansluta till konto</string>
-    <string name="problem_connecting_to_accounts">Kan inte ansluta till flera konton</string>
-    <string name="touch_to_fix">Tryck här för att hantera dina konton</string>
-    <string name="attach_file">Bifoga fil</string>
-    <string name="not_in_roster">Kontakten är inte i din kontaktlista. Vill du lägga till den?</string>
-    <string name="add_contact">Lägg till kontakt</string>
-    <string name="send_failed">sändning misslyckades</string>
-    <string name="send_rejected">avvisad</string>
-    <string name="receiving_image">Tar emot bildfil. Vänta&#8230;</string>
-    <string name="preparing_image">Förbereder bild för sändning</string>
-    <string name="action_clear_history">Rensa historik</string>
-    <string name="clear_conversation_history">Rensa konversationshistorik</string>
-    <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
-    <string name="delete_messages">Ta bort meddelanden</string>
-    <string name="also_end_conversation">Avsluta denna konversation efter</string>
-    <string name="send_plain_text_message">Skicka meddelande i klartext</string>
-    <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
-    <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
-    <string name="your_nick_has_been_changed">Ditt nick har ändrats</string>
-    <string name="download_image">Ladda ner bild</string>
-    <string name="image_offered_for_download"><i>Bildfil erbjuds för nedladdning</i></string>
-    <string name="send_unencrypted">Skicka okrypterat</string>
-    <string name="decryption_failed">Avkryptering gick fel. Du kanske inte har rätt privat nyckel.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations använder en tredjeparts applikation som heter <b>OpenKeychain</b> för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierat under GPLv3 och tillgängligt på F-Droid och Google Play.\n\n<small>(Starta om Conversations efter.)</small></string>
-    <string name="restart">Starta om</string>
-    <string name="install">Installera</string>
-    <string name="offering">erbjuder&#8230;</string>
-    <string name="waiting">väntar&#8230;</string>
-    <string name="no_pgp_key">Ingen OpenPGP-nyckel funnen</string>
-    <string name="contact_has_no_pgp_key">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
-    <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
-    <string name="contacts_have_no_pgp_keys">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>Krypterat meddelande mottaget. Tryck för att se och avkryptera.</i></string>
-    <string name="encrypted_image_received"><i>Krypterad bild mottagen. Tryck för att se och avkryptera.</i></string>
-    <string name="image_file"><i>Bild mottagen. Tryck för att se</i></string>
-    <string name="pref_xmpp_resource">XMPP resurs</string>
-    <string name="pref_xmpp_resource_summary">Namnet som klienten identifierar sig med</string>
-    <string name="pref_accept_files">Acceptera filer</string>
-    <string name="pref_accept_files_summary">Acceptera automatistk filer som är mindre än&#8230;</string>
-    <string name="pref_notification_settings">Notifieringsinställningar</string>
-    <string name="pref_notifications">Notifieringar</string>
-    <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
-    <string name="pref_vibrate">Vibrera</string>
-    <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string>
-    <string name="pref_sound">Ljud</string>
-    <string name="pref_sound_summary">Spela ljud med notifiering</string>
-    <string name="pref_conference_notifications">Konferensnotifieringar</string>
-    <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
-    <string name="pref_notification_grace_period">Notifieringsfrist</string>
-    <string name="pref_advanced_options">Avancerade inställningar</string>
-    <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
-    <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
-    <string name="pref_confirm_messages">Bekräfta meddelanden</string>
-    <string name="pref_confirm_messages_summary">Låter dina kontakter veta när du har tagit emot och läst ett meddelande</string>
-    <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
-    <string name="error_decrypting_file">I/O-fel vid avkryptering av fil</string>
-    <string name="accept">Acceptera</string>
-    <string name="error">Ett fel har inträffat</string>
-    <string name="pref_grant_presence_updates">Tillåt tillänglighetsuppdateringar</string>
-    <string name="pref_grant_presence_updates_summary">Tillåt i förväg och be om tillgänglighetsuppdateringar för kontakter du skapat</string>
-    <string name="subscriptions">Abonnemang</string>
-    <string name="your_account">Ditt konto</string>
-    <string name="keys">Nycklar</string>
-    <string name="send_presence_updates">Skicka tillgänglighetsuppdatering</string>
-    <string name="receive_presence_updates">Ta emot tillgänglighetsuppdateringar</string>
-    <string name="ask_for_presence_updates">Be om tillgänglighetsuppdateringar</string>
-    <string name="attach_choose_picture">Välj bild</string>
-    <string name="attach_take_picture">Ta ny bild</string>
-    <string name="preemptively_grant">Tillåt abonnemangsbegäran i förväg</string>
-    <string name="error_not_an_image_file">Filen du valt är inte en bild</string>
-    <string name="error_compressing_image">Fel vid konvertering av bildfilen</string>
-    <string name="error_file_not_found">Filen hittas ej</string>
-    <string name="error_io_exception">Generellt I/O-fel. Du kanske fick slut på plats?</string>
-    <string name="error_security_exception_during_image_copy">Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\n<small>Använd en annan filhanterare för att välja bild</small></string>
-    <string name="account_status_unknown">Okänd</string>
-    <string name="account_status_online">Online</string>
-    <string name="account_status_connecting">Ansluter\u2026</string>
-    <string name="account_status_offline">Offline</string>
-    <string name="account_status_unauthorized">Otillåten</string>
-    <string name="account_status_not_found">Server ej funnen</string>
-    <string name="account_status_no_internet">Ingen anslutning</string>
-    <string name="account_status_regis_fail">Registreringsfel</string>
-    <string name="account_status_regis_conflict">Användarnamn används redan</string>
-    <string name="account_status_regis_success">Registrering klar</string>
-    <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
-    <string name="encryption_choice_none">Klartext</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">Ändra konto</string>
-    <string name="mgmt_account_delete">Ta bort</string>
-    <string name="mgmt_account_enable">Aktivera</string>
-    <string name="mgmt_account_are_you_sure">Är du säker?</string>
-    <string name="mgmt_account_delete_confirm_text">Om du tar bort kontot kommer all konversationshistorik att försvinna</string>
-    <string name="attach_record_voice">Spela in röst</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="account_settings_password">Lösenord</string>
-    <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
-    <string name="account_settings_confirm_password">Bekräfta lösenord</string>
-    <string name="password">Lösenord</string>
-    <string name="confirm_password">Bekräfta lösenord</string>
-    <string name="passwords_do_not_match">Lösenorden är inte lika</string>
-    <string name="invalid_jid">Detta är inte ett korrekt Jabber ID</string>
-    <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
-    <string name="add_phone_book_text">Vill du lägga till %s i din telefons kontaktlista?</string>
-    <string name="contact_status_online">online</string>
-    <string name="contact_status_free_to_chat">tillgänglig</string>
-    <string name="contact_status_away">borta</string>
-    <string name="contact_status_extended_away">borta (förlängt)</string>
-    <string name="contact_status_do_not_disturb">stör ej</string>
-    <string name="contact_status_offline">offline</string>
-    <string name="muc_details_conference">Konferens</string>
-    <string name="muc_details_other_members">Andra medlemmar</string>
-    <string name="server_info_carbon_messages">Carbon Messages</string>
-    <string name="server_info_stream_management">Stream Management</string>
-    <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
-    <string name="last_seen_now">senast sedd just nu</string>
-    <string name="last_seen_min">senast sedd 1 minut sedan</string>
-    <string name="last_seen_mins">senast sedd %d minuter sedan</string>
-    <string name="last_seen_hour">senast sedd 1 timme sedan</string>
-    <string name="last_seen_hours">senast sedd %d timmar sedan</string>
-    <string name="last_seen_day">senast sedd 1 dag sedan</string>
-    <string name="last_seen_days">senast sedd %d dagar sedan</string>
-    <string name="never_seen">aldrig sedd</string>
-    <string name="install_openkeychain">Krypterat meddelande. Installera OpenKeychain för att avkryptera.</string>
-    <string name="unknown_otr_fingerprint">Okänt OTR-fingeravtryck</string>
-    <string name="openpgp_messages_found">OpenPGP-krypterat meddelande funnet</string>
-    <string name="reception_failed">Mottagning misslyckades</string>
-    <string name="your_fingerprint">Ditt fingeravtryck</string>
-    <string name="otr_fingerprint">OTR-fingeravtryck</string>
-    <string name="verify">Verifiera</string>
-    <string name="decrypt">Avkryptera</string>
-    <string name="conferences">Konferenser</string>
-    <string name="search">Sök</string>
-    <string name="create_contact">Skapa kontakt</string>
-    <string name="join_conference">Gå med i konferens</string>
-    <string name="delete_contact">Ta bort kontakt</string>
-    <string name="view_contact_details">Se kontaktdetaljer</string>
-    <string name="create">Skapa</string>
-    <string name="contact_already_exists">Kontakten finns redan</string>
-    <string name="join">Gå med</string>
-    <string name="conference_address">Konferensadress</string>
-    <string name="conference_address_example">rum@conference.exempel.se</string>
-    <string name="save_as_bookmark">Spara som bokmärke</string>
-    <string name="delete_bookmark">Ta bort bokmärke</string>
-    <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
-    <string name="you">Du</string>
-    <string name="action_edit_subject">Ändra konferensämne</string>
-    <string name="conference_not_found">Konferens hittades inte</string>
-    <string name="leave">Lämna</string>
-    <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
-    <string name="add_back">Addera tillbaks</string>
-    <string name="contact_has_read_up_to_this_point">%s har läst fram hit</string>
-    <string name="next">Nästa</string>
-    <string name="server_info_unavailable">otillgänglig</string>
-    <string name="mgmt_account_publish_pgp">Publisera OpenPGP publik nyckel</string>
-    <string name="additional_information">Ytterligare information</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
-    <string name="skip">skippa</string>
-    <string name="connect">Anslut</string>
-    <string name="account_already_exists">Detta konto finns redan</string>
-    <string name="private_message_to">till %s</string>
-    <string name="send_private_message_to">Skicka privat meddelande till %s</string>
-    <string name="touch_to_choose_picture">Tryck på avatarbild för att välja en bild från bildgalleriet</string>
-    <string name="mgmt_account_publish_avatar">Publisera avatarbild</string>
-    <string name="error_publish_avatar_server_reject">Servern kunde inte publisera</string>
-    <string name="error_publish_avatar_converting">Något gick fel vid konvertering av din bild</string>
-    <string name="error_publish_avatar_no_server_support">Din server stödjer inte publisering av avatarbilder</string>
-    <string name="publishing">Publiserar&#8230;</string>
-    <string name="error_saving_avatar">Kunde inte spara avatarbild till disk</string>
-    <string name="server_info_session_established">Nuvarande session upprättad</string>
-    <string name="or_long_press_for_default">(Eller tryck länge för att få tillbaks förvald)</string>
-    <string name="server_info_available">tillgänglig</string>
-    <string name="pref_general">Generellt</string>
-    <string name="publish">Publicera</string>
-    <string name="private_message">privat meddelande</string>
-    <string name="pref_ui_options">UI inställningar</string>
-    <string name="enable">Aktivera</string>
-    <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
-    <string name="disable_notifications">Inaktivera notifieringar</string>
-    <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
-    <string name="conference_requires_password">Konferensen kräver lösenord</string>
-    <string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
-    <string name="pref_encryption_settings">Krypteringsinställningar</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
-    <string name="missing_presence_updates">Saknar tillgänglighetsuppdateringar från kontakt</string>
-    <string name="pref_expert_options">Expertinställningar</string>
-    <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
-    <string name="pref_expert_options_summary">Var försiktig med dem</string>
-    <string name="disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
-    <string name="pref_use_send_button_to_indicate_status">Skickaknappen indikerar status</string>
-    <string name="enter_password">Fyll i lösenord</string>
-    <string name="notifications_disabled">Notifieringar är inaktiverade</string>
-    <string name="pref_force_encryption">Tvinga kryptering</string>
-    <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
-    <string name="ignore">Ignorera</string>
-    <string name="pref_use_larger_font_summary">Använd större teckenstorlek för hela applikationen</string>
-    <string name="pref_use_larger_font">Öka teckenstorlek</string>
-    <string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
-    <string name="delete_fingerprint">Ta bort fingeravtryck</string>
-    <string name="request_now">Begär nu</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="publish_avatar_explanation">Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild.</string>
-    <string name="choose_presence">Välj tillgänglighet till kontakt</string>
-    <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
-    <string name="account_status_disabled">Tillfälligt inaktiverad</string>
-    <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
-
+  <string name="action_settings">Inställningar</string>
+  <string name="action_add">Ny konversation</string>
+  <string name="action_accounts">Kontoinställningar</string>
+  <string name="action_end_conversation">Avsluta denna konversation</string>
+  <string name="action_contact_details">Kontaktdetaljer</string>
+  <string name="action_muc_details">Konferensdetaljer</string>
+  <string name="action_secure">Säker konversation</string>
+  <string name="action_add_account">Lägg till konto</string>
+  <string name="action_edit_contact">Ändra namn</string>
+  <string name="action_add_phone_book">Lägg till i telefonbok</string>
+  <string name="action_delete_contact">Ta bort kontakt</string>
+  <string name="action_block_contact">Blockera kontakt</string>
+  <string name="action_unblock_contact">Avblockera kontakt</string>
+  <string name="action_block_domain">Blockera domän</string>
+  <string name="action_unblock_domain">Avblockera domän</string>
+  <string name="title_activity_manage_accounts">Hantera konton</string>
+  <string name="title_activity_settings">Inställningar</string>
+  <string name="title_activity_conference_details">Konferensdetaljer</string>
+  <string name="title_activity_contact_details">Kontaktdetaljer</string>
+  <string name="title_activity_sharewith">Dela med konversation</string>
+  <string name="title_activity_start_conversation">Starta konversation</string>
+  <string name="title_activity_choose_contact">Välj kontakt</string>
+  <string name="title_activity_block_list">Blockeringslista</string>
+  <string name="just_now">just nu</string>
+  <string name="minute_ago">1 min sedan</string>
+  <string name="minutes_ago">%d min sedan</string>
+  <string name="unread_conversations">olästa konversationer</string>
+  <string name="sending">skickar…</string>
+  <string name="encrypted_message">Avkrypterar meddelande. Vänta…</string>
+  <string name="nick_in_use">Nick används redan</string>
+  <string name="admin">Admin</string>
+  <string name="owner">Ägare</string>
+  <string name="moderator">Moderator</string>
+  <string name="participant">Deltagare</string>
+  <string name="visitor">Besökare</string>
+  <string name="remove_contact_text">Vill du ta bort %s från din kontaktlista? Konversationer associerade med denna kontakt kommer inte tas bort.</string>
+  <string name="block_contact_text">Vill du blockera %s från att skicka dig meddelanden</string>
+  <string name="unblock_contact_text">Vill du avblockera %s och tillåta denne att skicka dig meddelanden?</string>
+  <string name="block_domain_text">Blockera alla kontakter från %s</string>
+  <string name="unblock_domain_text">Avblockera alla kontakter från %s</string>
+  <string name="contact_blocked">Kontakt blockerad</string>
+  <string name="remove_bookmark_text">Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort.</string>
+  <string name="register_account">Registrera nytt konto på servern</string>
+  <string name="change_password_on_server">Byt lösenord på server</string>
+  <string name="share_with">Dela med…</string>
+  <string name="start_conversation">Starta konversation</string>
+  <string name="invite_contact">Bjud in kontakt</string>
+  <string name="contacts">Kontakter</string>
+  <string name="cancel">Avbryt</string>
+  <string name="set">Sätt</string>
+  <string name="add">Lägg till</string>
+  <string name="edit">Ändra</string>
+  <string name="delete">Ta bort</string>
+  <string name="block">Blockera</string>
+  <string name="unblock">Avblockera</string>
+  <string name="save">Spara</string>
+  <string name="ok">Ok</string>
+  <string name="crash_report_title">Conversations har kraschat</string>
+  <string name="crash_report_message">Genom att skicka in stack traces hjälper du utvecklarna av Conversations\n<b>Varning:</b> Detta använder ditt XMPP konto för att skicka informationen till utvecklarna.</string>
+  <string name="send_now">Skicka nu</string>
+  <string name="send_never">Fråga aldrig igen</string>
+  <string name="problem_connecting_to_account">Kan inte ansluta till konto</string>
+  <string name="problem_connecting_to_accounts">Kan inte ansluta till flera konton</string>
+  <string name="touch_to_fix">Tryck här för att hantera dina konton</string>
+  <string name="attach_file">Bifoga fil</string>
+  <string name="not_in_roster">Kontakten är inte i din kontaktlista. Vill du lägga till den?</string>
+  <string name="add_contact">Lägg till kontakt</string>
+  <string name="send_failed">sändning misslyckades</string>
+  <string name="send_rejected">avvisad</string>
+  <string name="preparing_image">Förbereder bild för sändning</string>
+  <string name="action_clear_history">Rensa historik</string>
+  <string name="clear_conversation_history">Rensa konversationshistorik</string>
+  <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
+  <string name="delete_messages">Ta bort meddelanden</string>
+  <string name="also_end_conversation">Avsluta denna konversation efter</string>
+  <string name="choose_presence">Välj tillgänglighet till kontakt</string>
+  <string name="send_plain_text_message">Skicka meddelande i klartext</string>
+  <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
+  <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
+  <string name="your_nick_has_been_changed">Ditt nick har ändrats</string>
+  <string name="download_image">Ladda ner bild</string>
+  <string name="send_unencrypted">Skicka okrypterat</string>
+  <string name="decryption_failed">Avkryptering gick fel. Du kanske inte har rätt privat nyckel.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations använder en tredjeparts applikation som heter <b>OpenKeychain</b> för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierat under GPLv3 och tillgängligt på F-Droid och Google Play.\n\n<small>(Starta om Conversations efter.)</small></string>
+  <string name="restart">Starta om</string>
+  <string name="install">Installera</string>
+  <string name="offering">erbjuder…</string>
+  <string name="waiting">väntar…</string>
+  <string name="no_pgp_key">Ingen OpenPGP-nyckel funnen</string>
+  <string name="contact_has_no_pgp_key">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
+  <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
+  <string name="contacts_have_no_pgp_keys">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>Krypterat meddelande mottaget. Tryck för att se och avkryptera.</i></string>
+  <string name="pref_general">Generellt</string>
+  <string name="pref_xmpp_resource">XMPP resurs</string>
+  <string name="pref_xmpp_resource_summary">Namnet som klienten identifierar sig med</string>
+  <string name="pref_accept_files">Acceptera filer</string>
+  <string name="pref_accept_files_summary">Acceptera automatistk filer som är mindre än…</string>
+  <string name="pref_notification_settings">Notifieringsinställningar</string>
+  <string name="pref_notifications">Notifieringar</string>
+  <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
+  <string name="pref_vibrate">Vibrera</string>
+  <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string>
+  <string name="pref_sound">Ljud</string>
+  <string name="pref_sound_summary">Spela ljud med notifiering</string>
+  <string name="pref_conference_notifications">Konferensnotifieringar</string>
+  <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
+  <string name="pref_notification_grace_period">Notifieringsfrist</string>
+  <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
+  <string name="pref_advanced_options">Avancerade inställningar</string>
+  <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
+  <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
+  <string name="pref_confirm_messages">Bekräfta meddelanden</string>
+  <string name="pref_confirm_messages_summary">Låter dina kontakter veta när du har tagit emot och läst ett meddelande</string>
+  <string name="pref_ui_options">UI inställningar</string>
+  <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
+  <string name="error_decrypting_file">I/O-fel vid avkryptering av fil</string>
+  <string name="accept">Acceptera</string>
+  <string name="error">Ett fel har inträffat</string>
+  <string name="pref_grant_presence_updates">Tillåt tillänglighetsuppdateringar</string>
+  <string name="pref_grant_presence_updates_summary">Tillåt i förväg och be om tillgänglighetsuppdateringar för kontakter du skapat</string>
+  <string name="subscriptions">Abonnemang</string>
+  <string name="your_account">Ditt konto</string>
+  <string name="keys">Nycklar</string>
+  <string name="send_presence_updates">Skicka tillgänglighetsuppdatering</string>
+  <string name="receive_presence_updates">Ta emot tillgänglighetsuppdateringar</string>
+  <string name="ask_for_presence_updates">Be om tillgänglighetsuppdateringar</string>
+  <string name="attach_choose_picture">Välj bild</string>
+  <string name="attach_take_picture">Ta ny bild</string>
+  <string name="preemptively_grant">Tillåt abonnemangsbegäran i förväg</string>
+  <string name="error_not_an_image_file">Filen du valt är inte en bild</string>
+  <string name="error_compressing_image">Fel vid konvertering av bildfilen</string>
+  <string name="error_file_not_found">Filen hittas ej</string>
+  <string name="error_io_exception">Generellt I/O-fel. Du kanske fick slut på plats?</string>
+  <string name="error_security_exception_during_image_copy">Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\n<small>Använd en annan filhanterare för att välja bild</small></string>
+  <string name="account_status_unknown">Okänd</string>
+  <string name="account_status_disabled">Tillfälligt inaktiverad</string>
+  <string name="account_status_online">Online</string>
+  <string name="account_status_connecting">Ansluter\u2026</string>
+  <string name="account_status_offline">Offline</string>
+  <string name="account_status_unauthorized">Otillåten</string>
+  <string name="account_status_not_found">Server ej funnen</string>
+  <string name="account_status_no_internet">Ingen anslutning</string>
+  <string name="account_status_regis_fail">Registreringsfel</string>
+  <string name="account_status_regis_conflict">Användarnamn används redan</string>
+  <string name="account_status_regis_success">Registrering klar</string>
+  <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
+  <string name="account_status_security_error">Säkerhetsfel</string>
+  <string name="account_status_incompatible_server">Inkompatibel server</string>
+  <string name="encryption_choice_none">Klartext</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">Ändra konto</string>
+  <string name="mgmt_account_delete">Ta bort</string>
+  <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
+  <string name="mgmt_account_publish_avatar">Publisera avatarbild</string>
+  <string name="mgmt_account_publish_pgp">Publisera OpenPGP publik nyckel</string>
+  <string name="mgmt_account_enable">Aktivera</string>
+  <string name="mgmt_account_are_you_sure">Är du säker?</string>
+  <string name="mgmt_account_delete_confirm_text">Om du tar bort kontot kommer all konversationshistorik att försvinna</string>
+  <string name="attach_record_voice">Spela in röst</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">Lösenord</string>
+  <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
+  <string name="account_settings_confirm_password">Bekräfta lösenord</string>
+  <string name="password">Lösenord</string>
+  <string name="confirm_password">Bekräfta lösenord</string>
+  <string name="passwords_do_not_match">Lösenorden är inte lika</string>
+  <string name="invalid_jid">Detta är inte ett korrekt Jabber ID</string>
+  <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
+  <string name="add_phone_book_text">Vill du lägga till %s i din telefons kontaktlista?</string>
+  <string name="contact_status_online">online</string>
+  <string name="contact_status_free_to_chat">tillgänglig</string>
+  <string name="contact_status_away">borta</string>
+  <string name="contact_status_extended_away">borta (förlängt)</string>
+  <string name="contact_status_do_not_disturb">stör ej</string>
+  <string name="contact_status_offline">offline</string>
+  <string name="muc_details_conference">Konferens</string>
+  <string name="muc_details_other_members">Andra medlemmar</string>
+  <string name="server_info_show_more">Server info</string>
+  <string name="server_info_mam">XEP-0313: Message Archive</string>
+  <string name="server_info_carbon_messages">Carbon Messages</string>
+  <string name="server_info_csi">XEP-0352: Client State Indication</string>
+  <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_stream_management">Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
+  <string name="server_info_available">tillgänglig</string>
+  <string name="server_info_unavailable">otillgänglig</string>
+  <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
+  <string name="last_seen_now">senast sedd just nu</string>
+  <string name="last_seen_min">senast sedd 1 minut sedan</string>
+  <string name="last_seen_mins">senast sedd %d minuter sedan</string>
+  <string name="last_seen_hour">senast sedd 1 timme sedan</string>
+  <string name="last_seen_hours">senast sedd %d timmar sedan</string>
+  <string name="last_seen_day">senast sedd 1 dag sedan</string>
+  <string name="last_seen_days">senast sedd %d dagar sedan</string>
+  <string name="never_seen">aldrig sedd</string>
+  <string name="install_openkeychain">Krypterat meddelande. Installera OpenKeychain för att avkryptera.</string>
+  <string name="unknown_otr_fingerprint">Okänt OTR-fingeravtryck</string>
+  <string name="openpgp_messages_found">OpenPGP-krypterat meddelande funnet</string>
+  <string name="reception_failed">Mottagning misslyckades</string>
+  <string name="your_fingerprint">Ditt fingeravtryck</string>
+  <string name="otr_fingerprint">OTR-fingeravtryck</string>
+  <string name="verify">Verifiera</string>
+  <string name="decrypt">Avkryptera</string>
+  <string name="conferences">Konferenser</string>
+  <string name="search">Sök</string>
+  <string name="create_contact">Skapa kontakt</string>
+  <string name="join_conference">Gå med i konferens</string>
+  <string name="delete_contact">Ta bort kontakt</string>
+  <string name="view_contact_details">Se kontaktdetaljer</string>
+  <string name="block_contact">Blockera kontakt</string>
+  <string name="unblock_contact">Avblockera kontakt</string>
+  <string name="create">Skapa</string>
+  <string name="contact_already_exists">Kontakten finns redan</string>
+  <string name="join">Gå med</string>
+  <string name="conference_address">Konferensadress</string>
+  <string name="conference_address_example">rum@conference.exempel.se</string>
+  <string name="save_as_bookmark">Spara som bokmärke</string>
+  <string name="delete_bookmark">Ta bort bokmärke</string>
+  <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
+  <string name="you">Du</string>
+  <string name="action_edit_subject">Ändra konferensämne</string>
+  <string name="conference_not_found">Konferens hittades inte</string>
+  <string name="leave">Lämna</string>
+  <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
+  <string name="add_back">Addera tillbaks</string>
+  <string name="contact_has_read_up_to_this_point">%s har läst fram hit</string>
+  <string name="publish">Publicera</string>
+  <string name="touch_to_choose_picture">Tryck på avatarbild för att välja en bild från bildgalleriet</string>
+  <string name="publish_avatar_explanation">Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild.</string>
+  <string name="publishing">Publiserar…</string>
+  <string name="error_publish_avatar_server_reject">Servern kunde inte publisera</string>
+  <string name="error_publish_avatar_converting">Något gick fel vid konvertering av din bild</string>
+  <string name="error_saving_avatar">Kunde inte spara avatarbild till disk</string>
+  <string name="or_long_press_for_default">(Eller tryck länge för att få tillbaks förvald)</string>
+  <string name="error_publish_avatar_no_server_support">Din server stödjer inte publisering av avatarbilder</string>
+  <string name="private_message">privat meddelande</string>
+  <string name="private_message_to">till %s</string>
+  <string name="send_private_message_to">Skicka privat meddelande till %s</string>
+  <string name="connect">Anslut</string>
+  <string name="account_already_exists">Detta konto finns redan</string>
+  <string name="next">Nästa</string>
+  <string name="server_info_session_established">Nuvarande session upprättad</string>
+  <string name="additional_information">Ytterligare information</string>
+  <string name="skip">skippa</string>
+  <string name="disable_notifications">Inaktivera notifieringar</string>
+  <string name="disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
+  <string name="notifications_disabled">Notifieringar är inaktiverade</string>
+  <string name="enable">Aktivera</string>
+  <string name="conference_requires_password">Konferensen kräver lösenord</string>
+  <string name="enter_password">Fyll i lösenord</string>
+  <string name="missing_presence_updates">Saknar tillgänglighetsuppdateringar från kontakt</string>
+  <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
+  <string name="request_now">Begär nu</string>
+  <string name="delete_fingerprint">Ta bort fingeravtryck</string>
+  <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
+  <string name="ignore">Ignorera</string>
+  <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
+  <string name="pref_encryption_settings">Krypteringsinställningar</string>
+  <string name="pref_force_encryption">Tvinga kryptering</string>
+  <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
+  <string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
+  <string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
+  <string name="pref_expert_options">Expertinställningar</string>
+  <string name="pref_expert_options_summary">Var försiktig med dem</string>
+  <string name="title_activity_about">Om Conversations</string>
+  <string name="pref_about_conversations_summary">Bygg- och licensinformation</string>
+  <string name="title_pref_quiet_hours">Tysta timmar</string>
+  <string name="title_pref_quiet_hours_start_time">Starttid</string>
+  <string name="title_pref_quiet_hours_end_time">Sluttid</string>
+  <string name="title_pref_enable_quiet_hours">Aktivera tysta timmar</string>
+  <string name="pref_quiet_hours_summary">Notifieringar kommer vara tysta under tysta timmar</string>
+  <string name="pref_use_larger_font">Öka teckenstorlek</string>
+  <string name="pref_use_larger_font_summary">Använd större teckenstorlek för hela applikationen</string>
+  <string name="pref_use_send_button_to_indicate_status">Skickaknappen indikerar status</string>
+  <string name="pref_use_indicate_received">Begär mottagningskvitto</string>
+  <string name="pref_use_indicate_received_summary">Mottagna meddelanden markeras med en grön bock om det stöds</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
+  <string name="pref_expert_options_other">Annat</string>
+  <string name="pref_conference_name">Konferensnamn</string>
+  <string name="pref_conference_name_summary">Använd konferensens ämne istället för JID för att identifiera konferenser</string>
+  <string name="toast_message_otr_fingerprint">OTR-fingeravtryck har kopierats till urklipp!</string>
+  <string name="conference_banned">Du är bannlyst från denna konferens</string>
+  <string name="conference_members_only">Medlemsskap krävs för denna konferens</string>
+  <string name="conference_kicked">Du har blivit utsparkad från denna konferens</string>
+  <string name="using_account">använder konto %s</string>
+  <string name="checking_image">Kontrollerar bild på HTTP host</string>
+  <string name="image_file_deleted">Bildfilen har blivit borttagen</string>
+  <string name="not_connected_try_again">Du är inte ansluten. Försök igen senare</string>
+  <string name="check_image_filesize">Kontrollera bildens filstorlek</string>
+  <string name="message_options">Meddelandealternativ</string>
+  <string name="copy_text">Kopiera text</string>
+  <string name="copy_original_url">Kopiera orginal-URL</string>
+  <string name="send_again">Skicka igen</string>
+  <string name="image_url">Bild-URL</string>
+  <string name="message_text">Meddelandetext</string>
+  <string name="url_copied_to_clipboard">URL kopierad till urklipp</string>
+  <string name="message_copied_to_clipboard">Meddelande kopierad till urklipp</string>
+  <string name="image_transmission_failed">Bildöverföring lyckades inte</string>
+  <string name="scan_qr_code">Skanna QR-kod</string>
+  <string name="show_qr_code">Visa QR-kod</string>
+  <string name="show_block_list">Visa blockeringslista</string>
+  <string name="account_details">Kontodetaljer</string>
+  <string name="verify_otr">Verifiera OTR</string>
+  <string name="remote_fingerprint">Fjärr-fingeravtryck</string>
+  <string name="scan">skanna</string>
+  <string name="or_touch_phones">(eller nudda telefoner)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Ledtråd eller fråga</string>
+  <string name="shared_secret_secret">Delad hemlighet</string>
+  <string name="confirm">Bekräfta</string>
+  <string name="in_progress">Pågående</string>
+  <string name="respond">Svara</string>
+  <string name="failed">Lyckades ej</string>
+  <string name="secrets_do_not_match">Hemligheter matchar inte</string>
+  <string name="try_again">Försök igen</string>
+  <string name="finish">Klar</string>
+  <string name="verified">Verifierad</string>
+  <string name="smp_requested">Kontakt begärde SMP verifikation</string>
+  <string name="no_otr_session_found">Ingen giltig OTR-session kunde hittas!</string>
+  <string name="conversations_foreground_service">Conversations</string>
+  <string name="pref_keep_foreground_service">Håll tjänst i förgrunden</string>
+  <string name="pref_keep_foreground_service_summary">Förehindrar operativsystemet att ta ner uppkopplingen</string>
+  <string name="choose_file">Välj fil</string>
+  <string name="receiving_x_file">Tar emot %1$s (%2$d%% klart)</string>
+  <string name="download_x_file">Ladda ner %s</string>
+  <string name="file">fil</string>
+  <string name="open_x_file">Öppna %s</string>
+  <string name="sending_file">skickar (%1$d%% klart)</string>
+  <string name="preparing_file">Förbereder fil för överföring</string>
+  <string name="x_file_offered_for_download">%s erbjuden för nedladdning</string>
+  <string name="cancel_transmission">Avbryt överföring</string>
+  <string name="file_transmission_failed">filöverföring lyckades inte</string>
+  <string name="file_deleted">Filen har blivit borttagen</string>
+  <string name="no_application_found_to_open_file">Ingen applikation kunde hittas för att öppna filen</string>
+  <string name="could_not_verify_fingerprint">Kunde inte verifiera fingeravtryck</string>
+  <string name="manually_verify">Verifiera manuellt</string>
+  <string name="are_you_sure_verify_fingerprint">Är du säker på att du vill verifiera din kontakts OTR-fingeravtryck</string>
+  <string name="pref_show_dynamic_tags">Visa dynamiska taggar</string>
+  <string name="pref_show_dynamic_tags_summary">Visa skrivskyddade taggar under kontakter</string>
+  <string name="enable_notifications">Aktivera notifieringar</string>
+  <string name="conference_with">Skapa konferens med…</string>
+  <string name="no_conference_server_found">Ingen konferensserver hittad</string>
+  <string name="conference_creation_failed">Kunde inte skapa konferens</string>
+  <string name="conference_created">Konferens skapad!</string>
+  <string name="secret_accepted">Hemlighet accepterad!</string>
+  <string name="reset">Återställ</string>
+  <string name="account_image_description">Kontots avatarbild</string>
+  <string name="copy_otr_clipboard_description">Kopiera OTR-fingeravtryck till urklipp</string>
+  <string name="fetching_history_from_server">Hämtar historik från server</string>
+  <string name="no_more_history_on_server">Ingen mer historik på server</string>
+  <string name="updating">Uppdaterar…</string>
+  <string name="password_changed">Lösenord bytt!</string>
+  <string name="could_not_change_password">Kunde inte byta lösenord</string>
+  <string name="otr_session_not_started">Skicka meddelande för att påbörja en krypterad chat</string>
+  <string name="ask_question">Ställ fråga</string>
+  <string name="smp_explain_question">Om du och din kontakt har en delad hemlighet som ingen annan känner till (som ett internt skämt eller vad ni åt till lunch senast ni träffades) så kan ni ange den hemligheten för att verifiera varandras fingeravtryck.\n\nDu ger en ledtråd eller en fråga till din kontakt som ska svara med ett svar som är skiftlägeskänsligt.</string>
+  <string name="smp_explain_answer">Din kontakt vill verifiera ditt fingeravtryck genom att utmana dig med en delad hemlighet. Din kontakt gav följande ledtråd eller fråga för hemligheten.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Din ledtråd ska inte vara tom</string>
+  <string name="shared_secret_can_not_be_empty">Din delade hemlighet kan inte vara tom</string>
+  <string name="manual_verification_explanation">Jämför noggrant fingeravtrycker nedan med din kontakts fingeravtryck.\nDu kan använda valfri typ av betrodd kommunikation som ett krypterat e-mail eller ett telefonsamtal för att utbyta dessa.</string>
+  <string name="change_password">Byt lösenord</string>
+  <string name="current_password">Nuvarande lösenord</string>
+  <string name="new_password">Nytt lösenord</string>
+  <string name="password_should_not_be_empty">Lösenordet ska inte vara tomt</string>
+  <string name="enable_all_accounts">Aktivera alla konton</string>
+  <string name="disable_all_accounts">Deaktivera alla konton</string>
+  <string name="perform_action_with">Utför åtgärden med</string>
+  <string name="no_affiliation">Ingen anknytning</string>
+  <string name="no_role">Ingen roll</string>
+  <string name="outcast">Utstött</string>
+  <string name="member">Medlem</string>
+  <string name="advanced_mode">Avancerat läge</string>
+  <string name="grant_membership">Bevilja medlemsskap</string>
+  <string name="remove_membership">Återkalla medlemskap</string>
+  <string name="grant_admin_privileges">Bevilja administratörsbehörighet</string>
+  <string name="remove_admin_privileges">Återkalla administratörsbehörighet</string>
+  <string name="remove_from_room">Ta bort från konferens</string>
+  <string name="could_not_change_affiliation">Kunde inte ändra tillhörigheten för %s</string>
+  <string name="ban_from_conference">Bannlys från konferens</string>
+  <string name="removing_from_public_conference">Du försöker ta bort %s från en publik konferens. Det enda sätt att göra detta är att bannlysa användaren för evigt.</string>
+  <string name="ban_now">Bannlys nu</string>
+  <string name="could_not_change_role">Kunde inte ändra rollen för %s</string>
+  <string name="public_conference">Publikt tillgänglig konferens</string>
+  <string name="private_conference">Privat konferens där medlemsskap krävs</string>
+  <string name="conference_options">Konferensalternativ</string>
+  <string name="members_only">Privat (endast för medlemmar)</string>
+  <string name="non_anonymous">Icke-anonymt</string>
+  <string name="modified_conference_options">Ändrade konferensalternativ</string>
+  <string name="could_not_modify_conference_options">Kunde inte ändra konferensalternativ</string>
+  <string name="never">Aldrig</string>
+  <string name="thirty_minutes">30 minuter</string>
+  <string name="one_hour">1 timma</string>
+  <string name="two_hours">2 timmar</string>
+  <string name="eight_hours">8 timmar</string>
+  <string name="until_further_notice">Tills vidare</string>
+  <string name="pref_input_options">Inmatningsalternativ</string>
+  <string name="pref_enter_is_send">Skicka på enter</string>
+  <string name="pref_enter_is_send_summary">Använd enter-knappen för att skicka meddelande</string>
+  <string name="pref_display_enter_key">Visa enter-tangent</string>
+  <string name="pref_display_enter_key_summary">Byt ut emoticons-tangenten mot en enter-tangent</string>
+  <string name="audio">ljud</string>
+  <string name="video">video</string>
+  <string name="image">bild</string>
+  <string name="pdf_document">PDF-dokument</string>
+  <string name="apk">Android App</string>
+  <string name="vcard">Kontakt</string>
+  <string name="received_x_file">Tagit emot %s</string>
+  <string name="disable_foreground_service">Deaktivera fögrundstjänst</string>
+  <string name="touch_to_open_conversations">Tryck för att öppna Conversations</string>
+  <string name="avatar_has_been_published">Avatarbild har publiserats!</string>
+  <string name="sending_x_file">Skickar %s</string>
+  <string name="offering_x_file">Erbjuder %s</string>
+  <string name="hide_offline">Dölj ej anslutna</string>
 </resources>
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
new file mode 100644
index 00000000..75539533
--- /dev/null
+++ b/src/main/res/values-v21/themes.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primarydark</item>
+        <item name="android:colorAccent">@color/accent</item>
+
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item>
+        <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item>
+        <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item>
+        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item>
+        <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item>
+        <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item>
+        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item>
+        <item name="attr/icon_group">@drawable/ic_group_white_48dp</item>
+        <item name="attr/icon_new">@drawable/ic_add_white_48dp</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item>
+        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item>
+        <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item>
+        <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item>
+        <item name="attr/icon_search">@drawable/ic_search_white_48dp</item>
+        <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item>
+        <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item>
+        <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item>
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-w360dp/dimens.xml b/src/main/res/values-w360dp/dimens.xml
new file mode 100644
index 00000000..7e37ae16
--- /dev/null
+++ b/src/main/res/values-w360dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="conversations_overview_width">304dp</dimen>
+</resources>
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
new file mode 100644
index 00000000..5026848e
--- /dev/null
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="conversations_overview_width">336dp</dimen>
+</resources>
diff --git a/src/main/res/values-w600dp/dimens.xml b/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 00000000..df6525e6
--- /dev/null
+++ b/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,4 @@
+<resources>
+	<dimen name="conversations_overview_width">416dp</dimen>
+    <dimen name="activity_horizontal_margin">32dp</dimen>
+</resources>
diff --git a/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 3aeac9e7..00000000
--- a/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <!-- Customization of dimensions originally defined in res/values/dimens.xml
-				 (such as screen margins) for screens with more than 820dp of available
-				 width. This would include 7" and 10" devices in landscape (~960dp and
-				 ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/src/main/res/values-w960dp/dimens.xml b/src/main/res/values-w960dp/dimens.xml
new file mode 100644
index 00000000..146c0e15
--- /dev/null
+++ b/src/main/res/values-w960dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 1a243079..00000000
--- a/src/main/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>手机</item>
-        <item>电话</item>
-        <item>平板电脑</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>永不</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 分钟</item>
-        <item>1 小时</item>
-        <item>2 小时</item>
-        <item>8 小时</item>
-        <item>直至另行取消</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index b3b9604e..49ca9b97 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,259 +1,252 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">设置</string>
-    <string name="action_add">新会话</string>
-    <string name="action_accounts">管理账户</string>
-    <string name="action_end_conversation">结束会话</string>
-    <string name="action_contact_details">联系人详情</string>
-    <string name="action_muc_details">讨论组详情</string>
-    <string name="action_secure">安全对话</string>
-    <string name="action_add_account">添加账号</string>
-    <string name="action_edit_contact">编辑姓名</string>
-    <string name="action_add_phone_book">添加到手机通讯录</string>
-    <string name="action_delete_contact">从列表中删除</string>
-    <string name="title_activity_manage_accounts">管理账户</string>
-    <string name="title_activity_settings">设置</string>
-    <string name="title_activity_conference_details">讨论组详情</string>
-    <string name="title_activity_contact_details">联系人详情</string>
-    <string name="title_activity_conversations">Conversations</string>
-    <string name="title_activity_sharewith">分享会话</string>
-    <string name="title_activity_start_conversation">开始会话</string>
-    <string name="title_activity_choose_contact">选择联系人</string>
-    <string name="just_now">刚刚</string>
-    <string name="minute_ago">1 分钟前</string>
-    <string name="minutes_ago">%d分钟前</string>
-    <string name="unread_conversations">未读会话</string>
-    <string name="sending">正在发送&#8230;</string>
-    <string name="encrypted_message">解密信息中. 请稍候&#8230;</string>
-    <string name="nick_in_use">该名称已存在</string>
-    <string name="admin">管理员</string>
-    <string name="owner">所有者</string>
-    <string name="moderator">版主</string>
-    <string name="participant">参与者</string>
-    <string name="visitor">访客</string>
-    <string name="remove_contact_text">将 %s从列表中移除? 与该联系人的会话消息不会清除.</string>
-    <string name="remove_bookmark_text">从书签中移除 %s?相关会话消息不会被清除 .</string>
-    <string name="register_account">在服务器上注册新账户</string>
-    <string name="share_with">分享</string>
-    <string name="start_conversation">开始会话</string>
-    <string name="invite_contact">邀请联系人</string>
-    <string name="contacts">联系人</string>
-    <string name="cancel">取消</string>
-    <string name="add">添加</string>
-    <string name="edit">编辑</string>
-    <string name="delete">删除</string>
-    <string name="save">保存</string>
-    <string name="ok">完成</string>
-    <string name="crash_report_title">Conversations停止运行</string>
-    <string name="crash_report_message">发送堆栈跟踪到正在开发Conversations的人员\n<b>警告:</b> 该操作将用您的 XMPP账户发送堆栈跟踪到开发人员.</string>
-    <string name="send_now">现在发送</string>
-    <string name="send_never">不再询问</string>
-    <string name="problem_connecting_to_account">无法连接至账户</string>
-    <string name="problem_connecting_to_accounts">无法连接至多个账户</string>
-    <string name="touch_to_fix">点击此处管理账户</string>
-    <string name="attach_file">附件</string>
-    <string name="not_in_roster">该联系人不在您的列表.需要加为联系人吗 ?</string>
-    <string name="add_contact">添加联系人</string>
-    <string name="send_failed">传递失败</string>
-    <string name="send_rejected">拒绝</string>
-    <string name="receiving_image">接收图片文件中. 请稍候&#8230;</string>
-    <string name="preparing_image">准备传输图像</string>
-    <string name="action_clear_history">清除历史记录</string>
-    <string name="clear_conversation_history">清除会话记录</string>
-    <string name="clear_histor_msg">删除该会话中所有信息?\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息.</string>
-    <string name="delete_messages">删除消息</string>
-    <string name="also_end_conversation">之后结束该会话</string>
-    <string name="choose_presence">添加在线用户至联系人</string>
-    <string name="send_plain_text_message">发送纯文本信息</string>
-    <string name="send_otr_message">发送 OTR 加密信息</string>
-    <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
-    <string name="your_nick_has_been_changed">用户名修改成功</string>
-    <string name="download_image">下载图片</string>
-    <string name="image_offered_for_download"><i>供下载的图像文件</i></string>
-    <string name="send_unencrypted">不加密发送</string>
-    <string name="decryption_failed">解密失败，可能是私钥不正确.</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n<small>(之后请重启conversations.)</small></string>
-    <string name="restart">重启</string>
-    <string name="install">安装</string>
-    <string name="offering">输入&#8230;</string>
-    <string name="waiting">等待&#8230;</string>
-    <string name="no_pgp_key">未发现OpenPGP 密码</string>
-    <string name="contact_has_no_pgp_key">会话加密信息失败，因为联系人未告知他/她的公钥.\n\n<small>请通知联系人设置 OpenPGP.</small></string>
-    <string name="no_pgp_keys">未找到 OpenPGP 密码</string>
-    <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
-    <string name="encrypted_message_received"><i>加密信息已接收.点击进行解密和查看.</i></string>
-    <string name="encrypted_image_received"><i>加密图像已接收.点击进行解密和查看.</i></string>
-    <string name="image_file"><i>图片已成功接收，点击查看</i></string>
-    <string name="pref_general">常规</string>
-    <string name="pref_xmpp_resource">XMPP 资源</string>
-    <string name="pref_xmpp_resource_summary">客户端标识名称</string>
-    <string name="pref_accept_files">接收文件</string>
-    <string name="pref_accept_files_summary">自动接收小于 &#8230; 的文件</string>
-    <string name="pref_notification_settings">通知设置</string>
-    <string name="pref_notifications">通知</string>
-    <string name="pref_notifications_summary">收到新消息时通知</string>
-    <string name="pref_vibrate">震动</string>
-    <string name="pref_vibrate_summary">收到新消息时震动</string>
-    <string name="pref_sound">声音</string>
-    <string name="pref_sound_summary">收到新消息时播放铃声</string>
-    <string name="pref_conference_notifications">讨论组通知</string>
-    <string name="pref_conference_notifications_summary">当有新的消息时总是通知而不是亮屏时才通知</string>
-    <string name="pref_notification_grace_period">通知限期</string>
-    <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
-    <string name="pref_advanced_options">高级选项</string>
-    <string name="pref_never_send_crash">总不发送故障报告</string>
-    <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助Conversations开发人员</string>
-    <string name="pref_confirm_messages">确认消息</string>
-    <string name="pref_confirm_messages_summary">当你已收到消息并且已阅时通知好友</string>
-    <string name="pref_ui_options">UI选项</string>
-    <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
-    <string name="error_decrypting_file">解码文件时出现I/O错误</string>
-    <string name="accept">接受</string>
-    <string name="error">产生了一个错误</string>
-    <string name="pref_grant_presence_updates">同意更新在线联系人</string>
-    <string name="pref_grant_presence_updates_summary">预先同意并请求您的联系人进行更新</string>
-    <string name="subscriptions">关注</string>
-    <string name="your_account">你的账号</string>
-    <string name="keys">Keys</string>
-    <string name="send_presence_updates">发送在线联系人更新列表</string>
-    <string name="receive_presence_updates">接收在线联系人更新列表</string>
-    <string name="ask_for_presence_updates">请求在线联系人更新列表</string>
-    <string name="attach_choose_picture">选择图片</string>
-    <string name="attach_take_picture">照相</string>
-    <string name="preemptively_grant">预先同意订阅请求</string>
-    <string name="error_not_an_image_file">您选择的文件不是图像文件</string>
-    <string name="error_compressing_image">转换图像出错</string>
-    <string name="error_file_not_found">未找到文件</string>
-    <string name="error_io_exception">常规的I/O错误.可能是存储空间不足的原因？</string>
-    <string name="error_security_exception_during_image_copy">您用来选择图片的app没有给予足够权限支持我们读取文件.\n\n<small>请使用另一文件管理器选择图片</small></string>
-    <string name="account_status_unknown">未知</string>
-    <string name="account_status_disabled">暂时不可用</string>
-    <string name="account_status_online">在线</string>
-    <string name="account_status_connecting">Connecting\u2026</string>
-    <string name="account_status_offline">离线</string>
-    <string name="account_status_unauthorized">未授权</string>
-    <string name="account_status_not_found">未找到服务器</string>
-    <string name="account_status_no_internet">未连接网络</string>
-    <string name="account_status_regis_fail">注册失败</string>
-    <string name="account_status_regis_conflict"> 用户名已存在</string>
-    <string name="account_status_regis_success">注册完成</string>
-    <string name="account_status_regis_not_sup">服务器不支持注册</string>
-    <string name="encryption_choice_none">纯文本内容</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">编辑账号</string>
-    <string name="mgmt_account_delete">删除账号</string>
-    <string name="mgmt_account_disable">暂时不可用</string>
-    <string name="mgmt_account_publish_avatar">发布头像</string>
-    <string name="mgmt_account_publish_pgp">发布 OpenPGP 公共秘钥</string>
-    <string name="mgmt_account_enable">启用账户</string>
-    <string name="mgmt_account_are_you_sure">确定?</string>
-    <string name="mgmt_account_delete_confirm_text">如果删除用户，所有会话信息将会丢失</string>
-    <string name="attach_record_voice">Record voice 录音</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="account_settings_password">密码</string>
-    <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">确认密码</string>
-    <string name="password">密码</string>
-    <string name="confirm_password">确认密码</string>
-    <string name="passwords_do_not_match">密码不一致</string>
-    <string name="invalid_jid">该Jabber ID 无效</string>
-    <string name="error_out_of_memory">空间不足，图片过大</string>
-    <string name="add_phone_book_text">您将添加 %s 至手机联系人列表?</string>
-    <string name="contact_status_online">在线</string>
-    <string name="contact_status_free_to_chat">免费对话</string>
-    <string name="contact_status_away">离开</string>
-    <string name="contact_status_extended_away">长时间离开</string>
-    <string name="contact_status_do_not_disturb">请勿打扰</string>
-    <string name="contact_status_offline">离线</string>
-    <string name="muc_details_conference">讨论组</string>
-    <string name="muc_details_other_members">其他成员</string>
-    <string name="server_info_carbon_messages">XEP-0280: 消息碳</string>
-    <string name="server_info_stream_management">XEP-0198: 流管理</string>
-    <string name="server_info_pep">XEP-0163: PEP (头像)</string>
-    <string name="server_info_available">有效</string>
-    <string name="server_info_unavailable">无效</string>
-    <string name="missing_public_keys">缺少公共秘钥公告</string>
-    <string name="last_seen_now">最近一次查看为刚刚</string>
-    <string name="last_seen_min"> 最近一次查看为一分钟前</string>
-    <string name="last_seen_mins">最近一次查看为 %d 分钟前</string>
-    <string name="last_seen_hour">最近一次查看为一小时前</string>
-    <string name="last_seen_hours">最近一次查看为 %d 小时前</string>
-    <string name="last_seen_day">最近一次查看为一天前</string>
-    <string name="last_seen_days">最近一次查看为 %d天前</string>
-    <string name="never_seen">未曾查看</string>
-    <string name="install_openkeychain">加密信息. 请安装OpenKeychain进行解码.</string>
-    <string name="unknown_otr_fingerprint">未知 OTR指纹</string>
-    <string name="openpgp_messages_found">OpenPGP 发现加密信息</string>
-    <string name="reception_failed">接收失败</string>
-    <string name="your_fingerprint">你的指纹</string>
-    <string name="otr_fingerprint">OTR 指纹</string>
-    <string name="verify">验证</string>
-    <string name="decrypt">解密</string>
-    <string name="conferences">讨论组</string>
-    <string name="search">查找</string>
-    <string name="create_contact">创建联系人</string>
-    <string name="join_conference">加入讨论组</string>
-    <string name="delete_contact">删除联系人</string>
-    <string name="view_contact_details">查看联系人详细信息</string>
-    <string name="create">创建</string>
-    <string name="contact_already_exists">联系人已存在</string>
-    <string name="join">加入</string>
-    <string name="conference_address">讨论组地址</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">保存为书签</string>
-    <string name="delete_bookmark">删除书签</string>
-    <string name="bookmark_already_exists">该书签已存在</string>
-    <string name="you">你的</string>
-    <string name="action_edit_subject">编辑讨论组主题</string>
-    <string name="conference_not_found">讨论组未找到</string>
-    <string name="leave">离开</string>
-    <string name="contact_added_you">联系人已添加你到联系人列表</string>
-    <string name="add_back">反向添加</string>
-    <string name="contact_has_read_up_to_this_point">目前读到%s 处</string>
-    <string name="publish">发布</string>
-    <string name="touch_to_choose_picture">点击头像可选择头像 </string>
-    <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像.</string>
-    <string name="publishing">发布&#8230;</string>
-    <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布请求</string>
-    <string name="error_publish_avatar_converting">转换头像出错</string>
-    <string name="error_saving_avatar">不能将头像保存至disk</string>
-    <string name="or_long_press_for_default">(或长按按钮将返回默认头像)</string>
-    <string name="error_publish_avatar_no_server_support">您的服务器不支持发布头像</string>
-    <string name="private_message">密谈</string>
-    <string name="private_message_to">至 %s</string>
-    <string name="send_private_message_to">发送私密消息到%s</string>
-    <string name="connect">Connect</string>
-    <string name="account_already_exists">该账号已存在</string>
-    <string name="next">下一步</string>
-    <string name="server_info_session_established">当前会话已建立</string>
-    <string name="additional_information">其他信息</string>
-    <string name="skip">Skip略过</string>
-    <string name="disable_notifications">关闭通知</string>
-    <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
-    <string name="notifications_disabled">通知已关闭</string>
-    <string name="enable">打开通知</string>
-    <string name="conference_requires_password">讨论组设有密码</string>
-    <string name="enter_password">输入密码</string>
-    <string name="missing_presence_updates">缺少在线联系人更新</string>
-    <string name="request_presence_updates">请先发送更新在线联系人请求.\n\n<small>这将用来判断您的联系人所用的客户端类型人.</small></string>
-    <string name="request_now">现在发送请求</string>
-    <string name="delete_fingerprint">删除指纹</string>
-    <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
-    <string name="ignore">忽略</string>
-    <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题.\n\n<small>到联系人详情确认您订阅的在线联系人.</small></string>
-    <string name="pref_encryption_settings">加密设置</string>
-    <string name="pref_force_encryption">强制要求 end-to-end 加密</string>
-    <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
-    <string name="pref_dont_save_encrypted">不保存加密信息</string>
-    <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
-    <string name="pref_expert_options">Expert 选项</string>
-    <string name="pref_expert_options_summary">请谨慎使用</string>
-    <string name="pref_use_larger_font"> 放大字体</string>
-    <string name="pref_use_larger_font_summary">整个app界面使用更大号的字体</string>
-    <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
-
+  <string name="action_settings">设置</string>
+  <string name="action_add">新会话</string>
+  <string name="action_accounts">管理账户</string>
+  <string name="action_end_conversation">结束会话</string>
+  <string name="action_contact_details">联系人详情</string>
+  <string name="action_muc_details">讨论组详情</string>
+  <string name="action_secure">安全对话</string>
+  <string name="action_add_account">添加账号</string>
+  <string name="action_edit_contact">编辑姓名</string>
+  <string name="action_add_phone_book">添加到手机通讯录</string>
+  <string name="action_delete_contact">从列表中删除</string>
+  <string name="title_activity_manage_accounts">管理账户</string>
+  <string name="title_activity_settings">设置</string>
+  <string name="title_activity_conference_details">讨论组详情</string>
+  <string name="title_activity_contact_details">联系人详情</string>
+  <string name="title_activity_sharewith">分享会话</string>
+  <string name="title_activity_start_conversation">开始会话</string>
+  <string name="title_activity_choose_contact">选择联系人</string>
+  <string name="just_now">刚刚</string>
+  <string name="minute_ago">1 分钟前</string>
+  <string name="minutes_ago">%d分钟前</string>
+  <string name="unread_conversations">未读会话</string>
+  <string name="sending">正在发送…</string>
+  <string name="encrypted_message">解密信息中. 请稍候…</string>
+  <string name="nick_in_use">该名称已存在</string>
+  <string name="admin">管理员</string>
+  <string name="owner">所有者</string>
+  <string name="moderator">版主</string>
+  <string name="participant">参与者</string>
+  <string name="visitor">访客</string>
+  <string name="remove_contact_text">将 %s从列表中移除? 与该联系人的会话消息不会清除.</string>
+  <string name="remove_bookmark_text">从书签中移除 %s?相关会话消息不会被清除 .</string>
+  <string name="register_account">在服务器上注册新账户</string>
+  <string name="share_with">分享</string>
+  <string name="start_conversation">开始会话</string>
+  <string name="invite_contact">邀请联系人</string>
+  <string name="contacts">联系人</string>
+  <string name="cancel">取消</string>
+  <string name="add">添加</string>
+  <string name="edit">编辑</string>
+  <string name="delete">删除</string>
+  <string name="save">保存</string>
+  <string name="ok">完成</string>
+  <string name="crash_report_title">Conversations停止运行</string>
+  <string name="crash_report_message">发送堆栈跟踪到正在开发Conversations的人员\n<b>警告:</b> 该操作将用您的 XMPP账户发送堆栈跟踪到开发人员.</string>
+  <string name="send_now">现在发送</string>
+  <string name="send_never">不再询问</string>
+  <string name="problem_connecting_to_account">无法连接至账户</string>
+  <string name="problem_connecting_to_accounts">无法连接至多个账户</string>
+  <string name="touch_to_fix">点击此处管理账户</string>
+  <string name="attach_file">附件</string>
+  <string name="not_in_roster">该联系人不在您的列表.需要加为联系人吗 ?</string>
+  <string name="add_contact">添加联系人</string>
+  <string name="send_failed">传递失败</string>
+  <string name="send_rejected">拒绝</string>
+  <string name="preparing_image">准备传输图像</string>
+  <string name="action_clear_history">清除历史记录</string>
+  <string name="clear_conversation_history">清除会话记录</string>
+  <string name="clear_histor_msg">删除该会话中所有信息?\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息.</string>
+  <string name="delete_messages">删除消息</string>
+  <string name="also_end_conversation">之后结束该会话</string>
+  <string name="choose_presence">添加在线用户至联系人</string>
+  <string name="send_plain_text_message">发送纯文本信息</string>
+  <string name="send_otr_message">发送 OTR 加密信息</string>
+  <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
+  <string name="your_nick_has_been_changed">用户名修改成功</string>
+  <string name="download_image">下载图片</string>
+  <string name="send_unencrypted">不加密发送</string>
+  <string name="decryption_failed">解密失败，可能是私钥不正确.</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n<small>(之后请重启conversations.)</small></string>
+  <string name="restart">重启</string>
+  <string name="install">安装</string>
+  <string name="offering">输入…</string>
+  <string name="waiting">等待…</string>
+  <string name="no_pgp_key">未发现OpenPGP 密码</string>
+  <string name="contact_has_no_pgp_key">会话加密信息失败，因为联系人未告知他/她的公钥.\n\n<small>请通知联系人设置 OpenPGP.</small></string>
+  <string name="no_pgp_keys">未找到 OpenPGP 密码</string>
+  <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
+  <string name="encrypted_message_received"><i>加密信息已接收.点击进行解密和查看.</i></string>
+  <string name="pref_general">常规</string>
+  <string name="pref_xmpp_resource">XMPP 资源</string>
+  <string name="pref_xmpp_resource_summary">客户端标识名称</string>
+  <string name="pref_accept_files">接收文件</string>
+  <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
+  <string name="pref_notification_settings">通知设置</string>
+  <string name="pref_notifications">通知</string>
+  <string name="pref_notifications_summary">收到新消息时通知</string>
+  <string name="pref_vibrate">震动</string>
+  <string name="pref_vibrate_summary">收到新消息时震动</string>
+  <string name="pref_sound">声音</string>
+  <string name="pref_sound_summary">收到新消息时播放铃声</string>
+  <string name="pref_conference_notifications">讨论组通知</string>
+  <string name="pref_conference_notifications_summary">当有新的消息时总是通知而不是亮屏时才通知</string>
+  <string name="pref_notification_grace_period">通知限期</string>
+  <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
+  <string name="pref_advanced_options">高级选项</string>
+  <string name="pref_never_send_crash">总不发送故障报告</string>
+  <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助Conversations开发人员</string>
+  <string name="pref_confirm_messages">确认消息</string>
+  <string name="pref_confirm_messages_summary">当你已收到消息并且已阅时通知好友</string>
+  <string name="pref_ui_options">UI选项</string>
+  <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
+  <string name="error_decrypting_file">解码文件时出现I/O错误</string>
+  <string name="accept">接受</string>
+  <string name="error">产生了一个错误</string>
+  <string name="pref_grant_presence_updates">同意更新在线联系人</string>
+  <string name="pref_grant_presence_updates_summary">预先同意并请求您的联系人进行更新</string>
+  <string name="subscriptions">关注</string>
+  <string name="your_account">你的账号</string>
+  <string name="keys">Keys</string>
+  <string name="send_presence_updates">发送在线联系人更新列表</string>
+  <string name="receive_presence_updates">接收在线联系人更新列表</string>
+  <string name="ask_for_presence_updates">请求在线联系人更新列表</string>
+  <string name="attach_choose_picture">选择图片</string>
+  <string name="attach_take_picture">照相</string>
+  <string name="preemptively_grant">预先同意订阅请求</string>
+  <string name="error_not_an_image_file">您选择的文件不是图像文件</string>
+  <string name="error_compressing_image">转换图像出错</string>
+  <string name="error_file_not_found">未找到文件</string>
+  <string name="error_io_exception">常规的I/O错误.可能是存储空间不足的原因？</string>
+  <string name="error_security_exception_during_image_copy">您用来选择图片的app没有给予足够权限支持我们读取文件.\n\n<small>请使用另一文件管理器选择图片</small></string>
+  <string name="account_status_unknown">未知</string>
+  <string name="account_status_disabled">暂时不可用</string>
+  <string name="account_status_online">在线</string>
+  <string name="account_status_connecting">Connecting\u2026</string>
+  <string name="account_status_offline">离线</string>
+  <string name="account_status_unauthorized">未授权</string>
+  <string name="account_status_not_found">未找到服务器</string>
+  <string name="account_status_no_internet">未连接网络</string>
+  <string name="account_status_regis_fail">注册失败</string>
+  <string name="account_status_regis_conflict"> 用户名已存在</string>
+  <string name="account_status_regis_success">注册完成</string>
+  <string name="account_status_regis_not_sup">服务器不支持注册</string>
+  <string name="encryption_choice_none">纯文本内容</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">编辑账号</string>
+  <string name="mgmt_account_delete">删除账号</string>
+  <string name="mgmt_account_disable">暂时不可用</string>
+  <string name="mgmt_account_publish_avatar">发布头像</string>
+  <string name="mgmt_account_publish_pgp">发布 OpenPGP 公共秘钥</string>
+  <string name="mgmt_account_enable">启用账户</string>
+  <string name="mgmt_account_are_you_sure">确定?</string>
+  <string name="mgmt_account_delete_confirm_text">如果删除用户，所有会话信息将会丢失</string>
+  <string name="attach_record_voice">Record voice 录音</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">密码</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">确认密码</string>
+  <string name="password">密码</string>
+  <string name="confirm_password">确认密码</string>
+  <string name="passwords_do_not_match">密码不一致</string>
+  <string name="invalid_jid">该Jabber ID 无效</string>
+  <string name="error_out_of_memory">空间不足，图片过大</string>
+  <string name="add_phone_book_text">您将添加 %s 至手机联系人列表?</string>
+  <string name="contact_status_online">在线</string>
+  <string name="contact_status_free_to_chat">免费对话</string>
+  <string name="contact_status_away">离开</string>
+  <string name="contact_status_extended_away">长时间离开</string>
+  <string name="contact_status_do_not_disturb">请勿打扰</string>
+  <string name="contact_status_offline">离线</string>
+  <string name="muc_details_conference">讨论组</string>
+  <string name="muc_details_other_members">其他成员</string>
+  <string name="server_info_carbon_messages">XEP-0280: 消息碳</string>
+  <string name="server_info_stream_management">XEP-0198: 流管理</string>
+  <string name="server_info_pep">XEP-0163: PEP (头像)</string>
+  <string name="server_info_available">有效</string>
+  <string name="server_info_unavailable">无效</string>
+  <string name="missing_public_keys">缺少公共秘钥公告</string>
+  <string name="last_seen_now">最近一次查看为刚刚</string>
+  <string name="last_seen_min"> 最近一次查看为一分钟前</string>
+  <string name="last_seen_mins">最近一次查看为 %d 分钟前</string>
+  <string name="last_seen_hour">最近一次查看为一小时前</string>
+  <string name="last_seen_hours">最近一次查看为 %d 小时前</string>
+  <string name="last_seen_day">最近一次查看为一天前</string>
+  <string name="last_seen_days">最近一次查看为 %d天前</string>
+  <string name="never_seen">未曾查看</string>
+  <string name="install_openkeychain">加密信息. 请安装OpenKeychain进行解码.</string>
+  <string name="unknown_otr_fingerprint">未知 OTR指纹</string>
+  <string name="openpgp_messages_found">OpenPGP 发现加密信息</string>
+  <string name="reception_failed">接收失败</string>
+  <string name="your_fingerprint">你的指纹</string>
+  <string name="otr_fingerprint">OTR 指纹</string>
+  <string name="verify">验证</string>
+  <string name="decrypt">解密</string>
+  <string name="conferences">讨论组</string>
+  <string name="search">查找</string>
+  <string name="create_contact">创建联系人</string>
+  <string name="join_conference">加入讨论组</string>
+  <string name="delete_contact">删除联系人</string>
+  <string name="view_contact_details">查看联系人详细信息</string>
+  <string name="create">创建</string>
+  <string name="contact_already_exists">联系人已存在</string>
+  <string name="join">加入</string>
+  <string name="conference_address">讨论组地址</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">保存为书签</string>
+  <string name="delete_bookmark">删除书签</string>
+  <string name="bookmark_already_exists">该书签已存在</string>
+  <string name="you">你的</string>
+  <string name="action_edit_subject">编辑讨论组主题</string>
+  <string name="conference_not_found">讨论组未找到</string>
+  <string name="leave">离开</string>
+  <string name="contact_added_you">联系人已添加你到联系人列表</string>
+  <string name="add_back">反向添加</string>
+  <string name="contact_has_read_up_to_this_point">目前读到%s 处</string>
+  <string name="publish">发布</string>
+  <string name="touch_to_choose_picture">点击头像可选择头像 </string>
+  <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像.</string>
+  <string name="publishing">发布…</string>
+  <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布请求</string>
+  <string name="error_publish_avatar_converting">转换头像出错</string>
+  <string name="error_saving_avatar">不能将头像保存至disk</string>
+  <string name="or_long_press_for_default">(或长按按钮将返回默认头像)</string>
+  <string name="error_publish_avatar_no_server_support">您的服务器不支持发布头像</string>
+  <string name="private_message">密谈</string>
+  <string name="private_message_to">至 %s</string>
+  <string name="send_private_message_to">发送私密消息到%s</string>
+  <string name="connect">Connect</string>
+  <string name="account_already_exists">该账号已存在</string>
+  <string name="next">下一步</string>
+  <string name="server_info_session_established">当前会话已建立</string>
+  <string name="additional_information">其他信息</string>
+  <string name="skip">Skip略过</string>
+  <string name="disable_notifications">关闭通知</string>
+  <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
+  <string name="notifications_disabled">通知已关闭</string>
+  <string name="enable">打开通知</string>
+  <string name="conference_requires_password">讨论组设有密码</string>
+  <string name="enter_password">输入密码</string>
+  <string name="missing_presence_updates">缺少在线联系人更新</string>
+  <string name="request_presence_updates">请先发送更新在线联系人请求.\n\n<small>这将用来判断您的联系人所用的客户端类型人.</small></string>
+  <string name="request_now">现在发送请求</string>
+  <string name="delete_fingerprint">删除指纹</string>
+  <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
+  <string name="ignore">忽略</string>
+  <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题.\n\n<small>到联系人详情确认您订阅的在线联系人.</small></string>
+  <string name="pref_encryption_settings">加密设置</string>
+  <string name="pref_force_encryption">强制要求 end-to-end 加密</string>
+  <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
+  <string name="pref_dont_save_encrypted">不保存加密信息</string>
+  <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
+  <string name="pref_expert_options">Expert 选项</string>
+  <string name="pref_expert_options_summary">请谨慎使用</string>
+  <string name="pref_use_larger_font"> 放大字体</string>
+  <string name="pref_use_larger_font_summary">整个app界面使用更大号的字体</string>
+  <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index b9c261ad..00000000
--- a/src/main/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="resources">
-        <item>手機</item>
-        <item>電話</item>
-        <item>平板電腦</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>永不</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 分鐘</item>
-        <item>1 小時</item>
-        <item>2 小時</item>
-        <item>8 小時</item>
-        <item>直至另行取消</item>
-    </string-array>
-
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 24872cf7..8aed12d6 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -1,262 +1,255 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-    <string name="action_settings">設定</string>
-    <string name="action_add">新對話</string>
-    <string name="action_accounts">管理帳戶</string>
-    <string name="action_end_conversation">結束對話</string>
-    <string name="action_contact_details">聯絡人詳情</string>
-    <string name="action_secure">安全對話</string>
-    <string name="action_add_account">新增帳戶</string>
-    <string name="action_edit_contact">編輯姓名</string>
-    <string name="action_add_phone_book">新增到手機通訊錄</string>
-    <string name="action_delete_contact">從列表中刪除</string>
-    <string name="title_activity_manage_accounts">管理帳戶</string>
-    <string name="title_activity_conference_details">群組詳情</string>
-    <string name="title_activity_contact_details">聯絡人詳情</string>
-    <string name="title_activity_conversations">對話</string>
-    <string name="title_activity_sharewith">分享對話</string>
-    <string name="title_activity_start_conversation">開始對話</string>
-    <string name="title_activity_choose_contact">選擇聯絡人</string>
-    <string name="just_now">剛剛</string>
-    <string name="minute_ago">1 分鐘前</string>
-    <string name="minutes_ago">%d 分鐘前</string>
-    <string name="unread_conversations">未讀對話</string>
-    <string name="sending">正在發送&#8230;</string>
-    <string name="encrypted_message">正在解密訊息中，請稍候&#8230;</string>
-    <string name="nick_in_use">該用戶名稱已被使用</string>
-    <string name="admin">管理員</string>
-    <string name="owner">擁有人</string>
-    <string name="moderator">版主</string>
-    <string name="participant">成員</string>
-    <string name="visitor">訪客</string>
-    <string name="remove_contact_text">你確定要將 %s 從聯絡人清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
-    <string name="remove_bookmark_text">你確定要將 %s 從書籤清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
-    <string name="register_account">在伺服器上註冊新帳戶</string>
-    <string name="share_with">分享</string>
-    <string name="start_conversation">開始對話</string>
-    <string name="invite_contact">邀請聯絡人</string>
-    <string name="contacts">聯絡人</string>
-    <string name="cancel">取消</string>
-    <string name="add">新增</string>
-    <string name="edit">編輯</string>
-    <string name="delete">刪除</string>
-    <string name="save">儲存</string>
-    <string name="ok">好的</string>
-    <string name="crash_report_title">Conversations 停止運行</string>
-    <string name="crash_report_message">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式。\n<b>警告:</b> 你的 XMPP 帳戶將被用作發送有關訊息之用。</string>
-    <string name="send_now">現在發送</string>
-    <string name="send_never">不再詢問</string>
-    <string name="problem_connecting_to_account">無法連接至帳戶</string>
-    <string name="problem_connecting_to_accounts">無法連接至多個帳戶</string>
-    <string name="touch_to_fix">點擊此處管理帳戶。</string>
-    <string name="attach_file">附件</string>
-    <string name="not_in_roster">該聯絡人不在你的聯絡人清單上，需要加為聯絡人嗎?</string>
-    <string name="add_contact">新增聯絡人</string>
-    <string name="send_failed">傳遞失敗</string>
-    <string name="send_rejected">拒絕</string>
-    <string name="receiving_image">接收圖片文件中，請稍候&#8230;</string>
-    <string name="preparing_image">準備傳輸圖片</string>
-    <string name="action_clear_history">清除歷史記錄</string>
-    <string name="clear_conversation_history">清除對話記錄</string>
-    <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
-    <string name="delete_messages">刪除訊息</string>
-    <string name="also_end_conversation">之後結束這對話</string>
-    <string name="choose_presence">選擇狀態訊息</string>
-    <string name="send_plain_text_message">發送純文字訊息</string>
-    <string name="send_otr_message">發送 OTR 加密訊息</string>
-    <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
-    <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
-    <string name="download_image">下載圖片</string>
-    <string name="image_offered_for_download"><i>可供下載的圖像文件</i></string>
-    <string name="send_unencrypted">不加密發送</string>
-    <string name="decryption_failed">解密失敗，可能是私鑰不正確。</string>
-    <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations 使用一個名為 <b>OpenKeychain</b> 的第三方程式來加密、解碼訊息以及管理您的公鑰。\n\nOpenKeychain 以 GPLv3 釋出，並可在 F-Droid 和 Google Play 上下載。\n\n<small>(之後請重新啟動 Conversations。)</small></string>
-    <string name="restart">重新啟動</string>
-	<string name="install">安裝</string>
-    <string name="offering">提供中&#8230;</string>
-    <string name="waiting">等待中&#8230;</string>
-    <string name="no_pgp_key">找不到 OpenPGP 鑰匙</string>
-    <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
-    <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
-    <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
-    <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
-    <string name="encrypted_image_received"><i>已收到加密圖片，點擊進行解密和查看。</i></string>
-    <string name="image_file"><i>已收到圖片，點擊查看</i></string>
-    <string name="pref_general">一般</string>
-    <string name="pref_xmpp_resource">XMPP 資源</string>
-    <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
-    <string name="pref_accept_files">接收文件</string>
-    <string name="pref_accept_files_summary">自動接收小於 &#8230; 的文件</string>
-    <string name="pref_notification_settings">通知設定</string>
-    <string name="pref_notifications">通知</string>
-    <string name="pref_notifications_summary">收到新訊息時通知</string>
-    <string name="pref_vibrate">震動</string>
-    <string name="pref_vibrate_summary">收到新訊息時震動</string>
-    <string name="pref_sound">聲音</string>
-    <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
-    <string name="pref_conference_notifications">群組通知</string>
-    <string name="pref_conference_notifications_summary">當有新訊息時總是通知，而不是被標記時才通知</string>
-    <string name="pref_notification_grace_period">通知限期</string>
-    <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
-    <string name="pref_advanced_options">進階選項</string>
-    <string name="pref_never_send_crash">總是不發送故障報告</string>
-    <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
-    <string name="pref_confirm_messages">確認訊息</string>
-    <string name="pref_confirm_messages_summary">讓你的聯絡人知道你已收到及閱讀訊息</string>
-    <string name="pref_ui_options">介面選項</string>
-    <string name="openpgp_error">OpenKeychain 回報了一個錯誤</string>
-    <string name="error_decrypting_file">解密文件時出現 I/O 錯誤</string>
-    <string name="accept">接受</string>
-    <string name="error">發生了一個錯誤</string>
-    <string name="pref_grant_presence_updates">同意更新狀態訊息</string>
-    <string name="pref_grant_presence_updates_summary">預先更新狀態訊息並關注聯絡人的狀態訊息</string>
-    <string name="subscriptions">關注</string>
-    <string name="your_account">你的帳戶</string>
-    <string name="keys">鑰匙</string>
-    <string name="send_presence_updates">發送狀態訊息</string>
-    <string name="receive_presence_updates">接收狀態訊息</string>
-    <string name="ask_for_presence_updates">關注狀態訊息</string>
-    <string name="attach_choose_picture">選擇圖片</string>
-    <string name="attach_take_picture">拍照</string>
-    <string name="preemptively_grant">預先同意關注請求</string>
-    <string name="error_not_an_image_file">您選擇的文件不是圖片</string>
-    <string name="error_compressing_image">轉換圖片時發生錯誤</string>
-    <string name="error_file_not_found">找不到文件</string>
-    <string name="error_io_exception">一般的 I/O 錯誤。是存儲空間不足嗎？</string>
-    <string name="error_security_exception_during_image_copy">你用來選擇圖片的 app 沒有給予足夠權限我們去讀取文件。\n\n<small>請使用另一文件管理器來選擇圖片</small></string>
-    <string name="account_status_unknown">未知</string>
-    <string name="account_status_disabled">暫時停用</string>
-    <string name="account_status_online">在線</string>
-    <string name="account_status_connecting">連接中\u2026</string>
-    <string name="account_status_offline">離線</string>
-    <string name="account_status_unauthorized">未授權</string>
-    <string name="account_status_not_found">未找到伺服器</string>
-    <string name="account_status_no_internet">未連接網絡</string>
-    <string name="account_status_regis_fail">註冊失敗</string>
-    <string name="account_status_regis_conflict">該用戶名稱已被使用</string>
-    <string name="account_status_regis_success">註冊完成</string>
-    <string name="account_status_regis_not_sup">伺服器不支持註冊</string>
-    <string name="encryption_choice_none">純文字內容</string>
-    <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">OpenPGP</string>
-    <string name="mgmt_account_edit">編輯帳戶</string>
-    <string name="mgmt_account_delete">刪除帳戶</string>
-    <string name="mgmt_account_disable">暫時停用</string>
-    <string name="mgmt_account_publish_avatar">發佈頭像</string>
-    <string name="mgmt_account_publish_pgp">發布 OpenPGP 公共鑰匙</string>
-    <string name="mgmt_account_enable">啟用帳戶</string>
-    <string name="mgmt_account_are_you_sure">你確定嗎？</string>
-    <string name="mgmt_account_delete_confirm_text">如果刪除帳戶，則所有對話訊息將會被刪除</string>
-    <string name="attach_record_voice">錄音</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
-    <string name="account_settings_password">密碼</string>
-    <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">確認密碼</string>
-    <string name="password">密碼</string>
-    <string name="confirm_password">確認密碼</string>
-    <string name="passwords_do_not_match">密碼不一致</string>
-    <string name="invalid_jid">該 Jabber ID 無效</string>
-    <string name="error_out_of_memory">空間不足，圖片過大</string>
-    <string name="add_phone_book_text">你確定要新增 %s 為聯絡人嗎？</string>
-    <string name="contact_status_online">線上</string>
-    <string name="contact_status_free_to_chat">目前有空</string>
-    <string name="contact_status_away">離開</string>
-    <string name="contact_status_extended_away">長時間離開</string>
-    <string name="contact_status_do_not_disturb">請勿打擾</string>
-    <string name="contact_status_offline">離線</string>
-    <string name="muc_details_conference">群組</string>
-    <string name="muc_details_other_members">其他成員</string>
-    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
-    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-    <string name="server_info_available">支援</string>
-    <string name="server_info_unavailable">不支援</string>
-    <string name="missing_public_keys">沒有公佈公鑰訊息。</string>
-    <string name="last_seen_now">剛剛曾在線上</string>
-    <string name="last_seen_min">一分鐘前曾在線上</string>
-    <string name="last_seen_mins">%d 分鐘前曾在線上</string>
-    <string name="last_seen_hour">一小時前曾在線上</string>
-    <string name="last_seen_hours">%d 小時前曾在線上</string>
-    <string name="last_seen_day">一天前曾在線上</string>
-    <string name="last_seen_days">%d 天前曾在線上</string>
-    <string name="never_seen">未曾上線</string>
-    <string name="install_openkeychain">加密的訊息。請安裝 OpenKeychain 以解密。</string>
-    <string name="unknown_otr_fingerprint">未知的 OTR 指紋</string>
-    <string name="openpgp_messages_found">發現以 OpenPGP 加密的訊息</string>
-    <string name="reception_failed">接收失敗</string>
-    <string name="your_fingerprint">你的指紋</string>
-    <string name="otr_fingerprint">OTR 指紋</string>
-    <string name="verify">驗證</string>
-    <string name="decrypt">解密</string>
-    <string name="conferences">群組</string>
-    <string name="search">查找</string>
-    <string name="create_contact">新增聯絡人</string>
-    <string name="join_conference">加入群組</string>
-    <string name="delete_contact">刪除聯絡人</string>
-    <string name="view_contact_details">查看聯絡人詳細訊息</string>
-    <string name="create">新增</string>
-    <string name="contact_already_exists">聯絡人已存在</string>
-    <string name="join">加入</string>
-    <string name="conference_address">群組地址</string>
-    <string name="conference_address_example">room@conference.example.com</string>
-    <string name="save_as_bookmark">儲存為書籤</string>
-    <string name="delete_bookmark">刪除書籤</string>
-    <string name="bookmark_already_exists">該書籤已存在</string>
-    <string name="you">你</string>
-    <string name="action_edit_subject">編輯群組主題</string>
-    <string name="conference_not_found">群組未找到</string>
-    <string name="leave">離開</string>
-    <string name="contact_added_you">聯絡人已新增你到聯絡人列表</string>
-    <string name="add_back">新增為聯絡人</string>
-    <string name="contact_has_read_up_to_this_point">%s 讀到此處</string>
-    <string name="publish">發佈</string>
-    <string name="touch_to_choose_picture">點擊頭像可選擇頭像</string>
-    <string name="publish_avatar_explanation">請注意: 所有關注你狀態訊息的人將看到該圖像。</string>
-    <string name="publishing">發佈中&#8230;</string>
-    <string name="error_publish_avatar_server_reject">伺服器拒絕了你的發佈請求</string>
-    <string name="error_publish_avatar_converting">發佈頭像時發生錯誤</string>
-    <string name="error_saving_avatar">將頭像儲存至硬碟時發生錯誤</string>
-    <string name="or_long_press_for_default">(或長按以回復預設頭像)</string>
-    <string name="error_publish_avatar_no_server_support">你的伺服器不支持發佈頭像</string>
-    <string name="private_message">私密聊天</string>
-    <string name="private_message_to">給 %s</string>
-    <string name="send_private_message_to">發送私密消息給 %s</string>
-    <string name="connect">連接</string>
-    <string name="account_already_exists">該帳戶已存在</string>
-    <string name="next">下一步</string>
-    <string name="server_info_session_established">已建立連接</string>
-    <string name="additional_information">其他訊息</string>
-    <string name="skip">略過</string>
-    <string name="disable_notifications">關閉通知</string>
-    <string name="disable_notifications_for_this_conversation">關閉該對話消息</string>
-    <string name="notifications_disabled">通知已關閉</string>
-    <string name="enable">打開通知</string>
-    <string name="conference_requires_password">群組設有密碼</string>
-    <string name="enter_password">輸入密碼</string>
-    <string name="missing_presence_updates">缺少聯絡人狀態訊息</string>
-    <string name="request_presence_updates">請先發送關注狀態訊息請求。\n\n<small>這將用來判斷您的聯絡人所用的客戶端類型。</small></string>
-    <string name="request_now">現在發送請求</string>
-    <string name="delete_fingerprint">刪除指紋</string>
-    <string name="sure_delete_fingerprint">你確定刪除該指紋嗎？</string>
-    <string name="ignore">忽略</string>
-    <string name="without_mutual_presence_updates"><b>警告:</b> 在沒有互相關注狀態訊息的情況下發送或會引起不能預計的問題。\n\n<small>請檢視聯絡人詳情頁面以確認你們的關注狀態。</small></string>
-    <string name="pref_encryption_settings">加密設定</string>
-    <string name="pref_force_encryption">強制要求端到端加密</string>
-    <string name="pref_force_encryption_summary">總是發送加密訊息 (群組訊息除外)</string>
-    <string name="pref_dont_save_encrypted">不儲存加密訊息</string>
-    <string name="pref_dont_save_encrypted_summary">警告: 此操作或會導致訊息丟失</string>
-    <string name="pref_expert_options">專家選項</string>
-    <string name="pref_expert_options_summary">請小心設定</string>
-    <string name="pref_use_larger_font">增加字體大小</string>
-    <string name="pref_use_larger_font_summary">讓整個 app 界面使用更大號的字體</string>
-    <string name="pref_use_send_button_to_indicate_status">用「發送」按鈕顯示狀態訊息</string>
-    <string name="pref_use_indicate_received">要求讀取收據</string>
-    <string name="pref_use_indicate_received_summary">已被讀取的訊息會以綠色勾號表示。請注意，這個功能未必每次有效。</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">將「發送」按鈕設成不同顏色，以表示不同的狀態訊息。</string>
-    <string name="pref_expert_options_other">其他</string>
-    <string name="pref_conference_name">群組名稱</string>
-    <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string>
-
+  <string name="action_settings">設定</string>
+  <string name="action_add">新對話</string>
+  <string name="action_accounts">管理帳戶</string>
+  <string name="action_end_conversation">結束對話</string>
+  <string name="action_contact_details">聯絡人詳情</string>
+  <string name="action_secure">安全對話</string>
+  <string name="action_add_account">新增帳戶</string>
+  <string name="action_edit_contact">編輯姓名</string>
+  <string name="action_add_phone_book">新增到手機通訊錄</string>
+  <string name="action_delete_contact">從列表中刪除</string>
+  <string name="title_activity_manage_accounts">管理帳戶</string>
+  <string name="title_activity_conference_details">群組詳情</string>
+  <string name="title_activity_contact_details">聯絡人詳情</string>
+  <string name="title_activity_sharewith">分享對話</string>
+  <string name="title_activity_start_conversation">開始對話</string>
+  <string name="title_activity_choose_contact">選擇聯絡人</string>
+  <string name="just_now">剛剛</string>
+  <string name="minute_ago">1 分鐘前</string>
+  <string name="minutes_ago">%d 分鐘前</string>
+  <string name="unread_conversations">未讀對話</string>
+  <string name="sending">正在發送…</string>
+  <string name="encrypted_message">正在解密訊息中，請稍候…</string>
+  <string name="nick_in_use">該用戶名稱已被使用</string>
+  <string name="admin">管理員</string>
+  <string name="owner">擁有人</string>
+  <string name="moderator">版主</string>
+  <string name="participant">成員</string>
+  <string name="visitor">訪客</string>
+  <string name="remove_contact_text">你確定要將 %s 從聯絡人清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
+  <string name="remove_bookmark_text">你確定要將 %s 從書籤清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
+  <string name="register_account">在伺服器上註冊新帳戶</string>
+  <string name="share_with">分享</string>
+  <string name="start_conversation">開始對話</string>
+  <string name="invite_contact">邀請聯絡人</string>
+  <string name="contacts">聯絡人</string>
+  <string name="cancel">取消</string>
+  <string name="add">新增</string>
+  <string name="edit">編輯</string>
+  <string name="delete">刪除</string>
+  <string name="save">儲存</string>
+  <string name="ok">好的</string>
+  <string name="crash_report_title">Conversations 停止運行</string>
+  <string name="crash_report_message">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式。\n<b>警告:</b> 你的 XMPP 帳戶將被用作發送有關訊息之用。</string>
+  <string name="send_now">現在發送</string>
+  <string name="send_never">不再詢問</string>
+  <string name="problem_connecting_to_account">無法連接至帳戶</string>
+  <string name="problem_connecting_to_accounts">無法連接至多個帳戶</string>
+  <string name="touch_to_fix">點擊此處管理帳戶。</string>
+  <string name="attach_file">附件</string>
+  <string name="not_in_roster">該聯絡人不在你的聯絡人清單上，需要加為聯絡人嗎?</string>
+  <string name="add_contact">新增聯絡人</string>
+  <string name="send_failed">傳遞失敗</string>
+  <string name="send_rejected">拒絕</string>
+  <string name="preparing_image">準備傳輸圖片</string>
+  <string name="action_clear_history">清除歷史記錄</string>
+  <string name="clear_conversation_history">清除對話記錄</string>
+  <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
+  <string name="delete_messages">刪除訊息</string>
+  <string name="also_end_conversation">之後結束這對話</string>
+  <string name="choose_presence">選擇狀態訊息</string>
+  <string name="send_plain_text_message">發送純文字訊息</string>
+  <string name="send_otr_message">發送 OTR 加密訊息</string>
+  <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
+  <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
+  <string name="download_image">下載圖片</string>
+  <string name="send_unencrypted">不加密發送</string>
+  <string name="decryption_failed">解密失敗，可能是私鑰不正確。</string>
+  <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations 使用一個名為 <b>OpenKeychain</b> 的第三方程式來加密、解碼訊息以及管理您的公鑰。\n\nOpenKeychain 以 GPLv3 釋出，並可在 F-Droid 和 Google Play 上下載。\n\n<small>(之後請重新啟動 Conversations。)</small></string>
+  <string name="restart">重新啟動</string>
+  <string name="install">安裝</string>
+  <string name="offering">提供中…</string>
+  <string name="waiting">等待中…</string>
+  <string name="no_pgp_key">找不到 OpenPGP 鑰匙</string>
+  <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
+  <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
+  <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
+  <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
+  <string name="pref_general">一般</string>
+  <string name="pref_xmpp_resource">XMPP 資源</string>
+  <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
+  <string name="pref_accept_files">接收文件</string>
+  <string name="pref_accept_files_summary">自動接收小於 … 的文件</string>
+  <string name="pref_notification_settings">通知設定</string>
+  <string name="pref_notifications">通知</string>
+  <string name="pref_notifications_summary">收到新訊息時通知</string>
+  <string name="pref_vibrate">震動</string>
+  <string name="pref_vibrate_summary">收到新訊息時震動</string>
+  <string name="pref_sound">聲音</string>
+  <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
+  <string name="pref_conference_notifications">群組通知</string>
+  <string name="pref_conference_notifications_summary">當有新訊息時總是通知，而不是被標記時才通知</string>
+  <string name="pref_notification_grace_period">通知限期</string>
+  <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
+  <string name="pref_advanced_options">進階選項</string>
+  <string name="pref_never_send_crash">總是不發送故障報告</string>
+  <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
+  <string name="pref_confirm_messages">確認訊息</string>
+  <string name="pref_confirm_messages_summary">讓你的聯絡人知道你已收到及閱讀訊息</string>
+  <string name="pref_ui_options">介面選項</string>
+  <string name="openpgp_error">OpenKeychain 回報了一個錯誤</string>
+  <string name="error_decrypting_file">解密文件時出現 I/O 錯誤</string>
+  <string name="accept">接受</string>
+  <string name="error">發生了一個錯誤</string>
+  <string name="pref_grant_presence_updates">同意更新狀態訊息</string>
+  <string name="pref_grant_presence_updates_summary">預先更新狀態訊息並關注聯絡人的狀態訊息</string>
+  <string name="subscriptions">關注</string>
+  <string name="your_account">你的帳戶</string>
+  <string name="keys">鑰匙</string>
+  <string name="send_presence_updates">發送狀態訊息</string>
+  <string name="receive_presence_updates">接收狀態訊息</string>
+  <string name="ask_for_presence_updates">關注狀態訊息</string>
+  <string name="attach_choose_picture">選擇圖片</string>
+  <string name="attach_take_picture">拍照</string>
+  <string name="preemptively_grant">預先同意關注請求</string>
+  <string name="error_not_an_image_file">您選擇的文件不是圖片</string>
+  <string name="error_compressing_image">轉換圖片時發生錯誤</string>
+  <string name="error_file_not_found">找不到文件</string>
+  <string name="error_io_exception">一般的 I/O 錯誤。是存儲空間不足嗎？</string>
+  <string name="error_security_exception_during_image_copy">你用來選擇圖片的 app 沒有給予足夠權限我們去讀取文件。\n\n<small>請使用另一文件管理器來選擇圖片</small></string>
+  <string name="account_status_unknown">未知</string>
+  <string name="account_status_disabled">暫時停用</string>
+  <string name="account_status_online">在線</string>
+  <string name="account_status_connecting">連接中\u2026</string>
+  <string name="account_status_offline">離線</string>
+  <string name="account_status_unauthorized">未授權</string>
+  <string name="account_status_not_found">未找到伺服器</string>
+  <string name="account_status_no_internet">未連接網絡</string>
+  <string name="account_status_regis_fail">註冊失敗</string>
+  <string name="account_status_regis_conflict">該用戶名稱已被使用</string>
+  <string name="account_status_regis_success">註冊完成</string>
+  <string name="account_status_regis_not_sup">伺服器不支持註冊</string>
+  <string name="encryption_choice_none">純文字內容</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="mgmt_account_edit">編輯帳戶</string>
+  <string name="mgmt_account_delete">刪除帳戶</string>
+  <string name="mgmt_account_disable">暫時停用</string>
+  <string name="mgmt_account_publish_avatar">發佈頭像</string>
+  <string name="mgmt_account_publish_pgp">發布 OpenPGP 公共鑰匙</string>
+  <string name="mgmt_account_enable">啟用帳戶</string>
+  <string name="mgmt_account_are_you_sure">你確定嗎？</string>
+  <string name="mgmt_account_delete_confirm_text">如果刪除帳戶，則所有對話訊息將會被刪除</string>
+  <string name="attach_record_voice">錄音</string>
+  <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="account_settings_password">密碼</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">確認密碼</string>
+  <string name="password">密碼</string>
+  <string name="confirm_password">確認密碼</string>
+  <string name="passwords_do_not_match">密碼不一致</string>
+  <string name="invalid_jid">該 Jabber ID 無效</string>
+  <string name="error_out_of_memory">空間不足，圖片過大</string>
+  <string name="add_phone_book_text">你確定要新增 %s 為聯絡人嗎？</string>
+  <string name="contact_status_online">線上</string>
+  <string name="contact_status_free_to_chat">目前有空</string>
+  <string name="contact_status_away">離開</string>
+  <string name="contact_status_extended_away">長時間離開</string>
+  <string name="contact_status_do_not_disturb">請勿打擾</string>
+  <string name="contact_status_offline">離線</string>
+  <string name="muc_details_conference">群組</string>
+  <string name="muc_details_other_members">其他成員</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+  <string name="server_info_available">支援</string>
+  <string name="server_info_unavailable">不支援</string>
+  <string name="missing_public_keys">沒有公佈公鑰訊息。</string>
+  <string name="last_seen_now">剛剛曾在線上</string>
+  <string name="last_seen_min">一分鐘前曾在線上</string>
+  <string name="last_seen_mins">%d 分鐘前曾在線上</string>
+  <string name="last_seen_hour">一小時前曾在線上</string>
+  <string name="last_seen_hours">%d 小時前曾在線上</string>
+  <string name="last_seen_day">一天前曾在線上</string>
+  <string name="last_seen_days">%d 天前曾在線上</string>
+  <string name="never_seen">未曾上線</string>
+  <string name="install_openkeychain">加密的訊息。請安裝 OpenKeychain 以解密。</string>
+  <string name="unknown_otr_fingerprint">未知的 OTR 指紋</string>
+  <string name="openpgp_messages_found">發現以 OpenPGP 加密的訊息</string>
+  <string name="reception_failed">接收失敗</string>
+  <string name="your_fingerprint">你的指紋</string>
+  <string name="otr_fingerprint">OTR 指紋</string>
+  <string name="verify">驗證</string>
+  <string name="decrypt">解密</string>
+  <string name="conferences">群組</string>
+  <string name="search">查找</string>
+  <string name="create_contact">新增聯絡人</string>
+  <string name="join_conference">加入群組</string>
+  <string name="delete_contact">刪除聯絡人</string>
+  <string name="view_contact_details">查看聯絡人詳細訊息</string>
+  <string name="create">新增</string>
+  <string name="contact_already_exists">聯絡人已存在</string>
+  <string name="join">加入</string>
+  <string name="conference_address">群組地址</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">儲存為書籤</string>
+  <string name="delete_bookmark">刪除書籤</string>
+  <string name="bookmark_already_exists">該書籤已存在</string>
+  <string name="you">你</string>
+  <string name="action_edit_subject">編輯群組主題</string>
+  <string name="conference_not_found">群組未找到</string>
+  <string name="leave">離開</string>
+  <string name="contact_added_you">聯絡人已新增你到聯絡人列表</string>
+  <string name="add_back">新增為聯絡人</string>
+  <string name="contact_has_read_up_to_this_point">%s 讀到此處</string>
+  <string name="publish">發佈</string>
+  <string name="touch_to_choose_picture">點擊頭像可選擇頭像</string>
+  <string name="publish_avatar_explanation">請注意: 所有關注你狀態訊息的人將看到該圖像。</string>
+  <string name="publishing">發佈中…</string>
+  <string name="error_publish_avatar_server_reject">伺服器拒絕了你的發佈請求</string>
+  <string name="error_publish_avatar_converting">發佈頭像時發生錯誤</string>
+  <string name="error_saving_avatar">將頭像儲存至硬碟時發生錯誤</string>
+  <string name="or_long_press_for_default">(或長按以回復預設頭像)</string>
+  <string name="error_publish_avatar_no_server_support">你的伺服器不支持發佈頭像</string>
+  <string name="private_message">私密聊天</string>
+  <string name="private_message_to">給 %s</string>
+  <string name="send_private_message_to">發送私密消息給 %s</string>
+  <string name="connect">連接</string>
+  <string name="account_already_exists">該帳戶已存在</string>
+  <string name="next">下一步</string>
+  <string name="server_info_session_established">已建立連接</string>
+  <string name="additional_information">其他訊息</string>
+  <string name="skip">略過</string>
+  <string name="disable_notifications">關閉通知</string>
+  <string name="disable_notifications_for_this_conversation">關閉該對話消息</string>
+  <string name="notifications_disabled">通知已關閉</string>
+  <string name="enable">打開通知</string>
+  <string name="conference_requires_password">群組設有密碼</string>
+  <string name="enter_password">輸入密碼</string>
+  <string name="missing_presence_updates">缺少聯絡人狀態訊息</string>
+  <string name="request_presence_updates">請先發送關注狀態訊息請求。\n\n<small>這將用來判斷您的聯絡人所用的客戶端類型。</small></string>
+  <string name="request_now">現在發送請求</string>
+  <string name="delete_fingerprint">刪除指紋</string>
+  <string name="sure_delete_fingerprint">你確定刪除該指紋嗎？</string>
+  <string name="ignore">忽略</string>
+  <string name="without_mutual_presence_updates"><b>警告:</b> 在沒有互相關注狀態訊息的情況下發送或會引起不能預計的問題。\n\n<small>請檢視聯絡人詳情頁面以確認你們的關注狀態。</small></string>
+  <string name="pref_encryption_settings">加密設定</string>
+  <string name="pref_force_encryption">強制要求端到端加密</string>
+  <string name="pref_force_encryption_summary">總是發送加密訊息 (群組訊息除外)</string>
+  <string name="pref_dont_save_encrypted">不儲存加密訊息</string>
+  <string name="pref_dont_save_encrypted_summary">警告: 此操作或會導致訊息丟失</string>
+  <string name="pref_expert_options">專家選項</string>
+  <string name="pref_expert_options_summary">請小心設定</string>
+  <string name="pref_use_larger_font">增加字體大小</string>
+  <string name="pref_use_larger_font_summary">讓整個 app 界面使用更大號的字體</string>
+  <string name="pref_use_send_button_to_indicate_status">用「發送」按鈕顯示狀態訊息</string>
+  <string name="pref_use_indicate_received">要求讀取收據</string>
+  <string name="pref_use_indicate_received_summary">已被讀取的訊息會以綠色勾號表示。請注意，這個功能未必每次有效。</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">將「發送」按鈕設成不同顏色，以表示不同的狀態訊息。</string>
+  <string name="pref_expert_options_other">其他</string>
+  <string name="pref_conference_name">群組名稱</string>
+  <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string>
 </resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 4acc9e62..c413a3c4 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="resources">
-        <item>Mobile</item>
-        <item>Phone</item>
-        <item>Tablet</item>
-        <item>Conversations</item>
-        <item>Android</item>
-    </string-array>
-    <string-array name="filesizes">
-        <item>never</item>
-        <item>256 KB</item>
-        <item>512 KB</item>
-        <item>1 MB</item>
-    </string-array>
-    <string-array name="filesizes_values">
-        <item>0</item>
-        <item>262144</item>
-        <item>524288</item>
-        <item>1048576</item>
-    </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>8 hours</item>
-        <item>until further notice</item>
-    </string-array>
+	<string-array name="resources">
+		<item>Mobile</item>
+		<item>Phone</item>
+		<item>Tablet</item>
+		<item>Conversations</item>
+		<item>Android</item>
+	</string-array>
+	<string-array name="filesizes">
+		<item>@string/never</item>
+		<item>256 KiB</item>
+		<item>512 KiB</item>
+		<item>1 MiB</item>
+		<item>5 MiB</item>
+		<item>10 MiB</item>
+	</string-array>
+	<string-array name="filesizes_values">
+		<item>0</item>
+		<item>262144</item>
+		<item>524288</item>
+		<item>1048576</item>
+		<item>5242880</item>
+		<item>10485760</item>
+	</string-array>
+	<string-array name="mute_options_descriptions">
+		<item>@string/thirty_minutes</item>
+		<item>@string/one_hour</item>
+		<item>@string/two_hours</item>
+		<item>@string/eight_hours</item>
+		<item>@string/until_further_notice</item>
+	</string-array>
 
-    <integer-array name="mute_options_durations">
-        <item>1800</item>
-        <item>3600</item>
-        <item>7200</item>
-        <item>28800</item>
-        <item>-1</item>
-    </integer-array>
+	<integer-array name="mute_options_durations">
+		<item>1800</item>
+		<item>3600</item>
+		<item>7200</item>
+		<item>28800</item>
+		<item>-1</item>
+	</integer-array>
 
 </resources>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8..e314f752 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,4 +5,24 @@
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
 
+    <attr name="icon_add_group" format="reference"/>
+    <attr name="icon_add_person" format="reference"/>
+    <attr name="icon_cancel" format="reference"/>
+    <attr name="icon_chat" format="reference"/>
+    <attr name="icon_copy" format="reference"/>
+    <attr name="icon_discard" format="reference"/>
+    <attr name="icon_download" format="reference"/>
+    <attr name="icon_edit" format="reference"/>
+    <attr name="icon_edit_dark" format="reference"/>
+    <attr name="icon_group" format="reference"/>
+    <attr name="icon_new" format="reference"/>
+    <attr name="icon_new_attachment" format="reference"/>
+    <attr name="icon_not_secure" format="reference"/>
+    <attr name="icon_refresh" format="reference"/>
+    <attr name="icon_remove" format="reference"/>
+    <attr name="icon_search" format="reference"/>
+    <attr name="icon_secure" format="reference"/>
+    <attr name="icon_settings" format="reference"/>
+    <attr name="icon_import_export" format="reference"/>
+
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 908b8b89..c21650a5 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
 
     <color name="primary" type="color">#ff259b24</color>
     <color name="primarydark" type="color">#ff0a7e07</color>
+    <color name="accent">#ff0091ea</color>
     <color name="primarytext" type="color">#de000000</color>
     <color name="secondarytext" type="color">#8a000000</color>
     <color name="ondarktext" type="color">#fffafafa</color>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 47c82246..79e920e9 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,5 +1,7 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="activity_horizontal_margin">8dp</dimen>
+    <dimen name="activity_vertical_margin">8dp</dimen>
+	<dimen name="infocard_padding">16dp</dimen>
+	<dimen name="conversations_overview_width">288dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bc3c4ece..ccb4b67a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -21,7 +21,6 @@
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_conference_details">Conference Details</string>
     <string name="title_activity_contact_details">Contact Details</string>
-    <string name="title_activity_conversations">Conversations</string>
     <string name="title_activity_sharewith">Share with Conversation</string>
     <string name="title_activity_start_conversation">Start Conversation</string>
     <string name="title_activity_choose_contact">Choose contact</string>
@@ -47,7 +46,7 @@
     <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
     <string name="register_account">Register new account on server</string>
     <string name="change_password_on_server">Change password on server</string>
-    <string name="share_with">Share with</string>
+    <string name="share_with">Share with…</string>
     <string name="start_conversation">Start Conversation</string>
     <string name="invite_contact">Invite Contact</string>
     <string name="contacts">Contacts</string>
@@ -72,7 +71,6 @@
     <string name="add_contact">Add contact</string>
     <string name="send_failed">delivery failed</string>
     <string name="send_rejected">rejected</string>
-    <string name="receiving_image">Receiving image file (%1$d%%)</string>
     <string name="preparing_image">Preparing image for transmission</string>
     <string name="action_clear_history">Clear history</string>
     <string name="clear_conversation_history">Clear Conversation History</string>
@@ -85,7 +83,6 @@
     <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
-    <string name="image_offered_for_download"><i>Image file offered for download</i></string>
     <string name="send_unencrypted">Send unencrypted</string>
     <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
     <string name="openkeychain_required">OpenKeychain</string>
@@ -99,8 +96,6 @@
     <string name="no_pgp_keys">No OpenPGP Keys found</string>
     <string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
-    <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
-    <string name="image_file"><i>Image received. Touch to view</i></string>
     <string name="pref_general">General</string>
     <string name="pref_xmpp_resource">XMPP resource</string>
     <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
@@ -275,8 +270,6 @@
     <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
     <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
     <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
-    <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
-    <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
     <string name="pref_expert_options">Expert options</string>
     <string name="pref_expert_options_summary">Please be careful with these</string>
     <string name="title_activity_about">About Conversations</string>
@@ -304,6 +297,7 @@
             \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
             \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
             \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
     </string>
     <string name="title_pref_quiet_hours">Quiet Hours</string>
     <string name="title_pref_quiet_hours_start_time">Start time</string>
@@ -330,7 +324,6 @@
     <string name="check_image_filesize">Check image file size</string>
     <string name="message_options">Message options</string>
     <string name="copy_text">Copy text</string>
-    <string name="share_image">Share image</string>
     <string name="copy_original_url">Copy original URL</string>
     <string name="send_again">Send again</string>
     <string name="image_url">Image URL</string>
@@ -360,17 +353,16 @@
     <string name="smp_requested">Contact requested SMP verification</string>
     <string name="no_otr_session_found">No valid OTR session has been found!</string>
     <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Touch to disable foreground service</string>
     <string name="pref_keep_foreground_service">Keep service in foreground</string>
     <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
     <string name="choose_file">Choose file</string>
-    <string name="receiving_file">Receiving %1$s file (%2$d%% completed)</string>
-    <string name="download_file">Download %s file</string>
-    <string name="open_file">Open %s file</string>
+    <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string>
+    <string name="download_x_file">Download %s</string>
+    <string name="file">file</string>
+    <string name="open_x_file">Open %s</string>
     <string name="sending_file">sending (%1$d%% completed)</string>
     <string name="preparing_file">Preparing file for transmission</string>
-    <string name="file_offered_for_download">File offered for download</string>
-    <string name="file">%s file</string>
+    <string name="x_file_offered_for_download">%s offered for download</string>
     <string name="cancel_transmission">Cancel transmission</string>
     <string name="file_transmission_failed">file transmission failed</string>
     <string name="file_deleted">The file has been deleted</string>
@@ -408,4 +400,50 @@
 	<string name="enable_all_accounts">Enable all accounts</string>
 	<string name="disable_all_accounts">Disable all accounts</string>
 	<string name="perform_action_with">Perform action with</string>
+	<string name="no_affiliation">No affiliation</string>
+	<string name="no_role">No role</string>
+	<string name="outcast">Outcast</string>
+	<string name="member">Member</string>
+	<string name="advanced_mode">Advanced mode</string>
+	<string name="grant_membership">Grant membership</string>
+	<string name="remove_membership">Revoke membership</string>
+	<string name="grant_admin_privileges">Grant admin privileges</string>
+	<string name="remove_admin_privileges">Revoke admin privileges</string>
+	<string name="remove_from_room">Remove from conference</string>
+	<string name="could_not_change_affiliation">Could not change affiliation of %s</string>
+	<string name="ban_from_conference">Ban from conference</string>
+	<string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string>
+	<string name="ban_now">Ban now</string>
+	<string name="could_not_change_role">Could not change role of %s</string>
+	<string name="public_conference">Publicly accessible conference</string>
+	<string name="private_conference">Private, members only conference</string>
+	<string name="conference_options">Conference options</string>
+	<string name="members_only">Private (Members only)</string>
+	<string name="non_anonymous">Non-anonymous</string>
+	<string name="modified_conference_options">Modified conference options!</string>
+	<string name="could_not_modify_conference_options">Could not modify conference options</string>
+	<string name="never">Never</string>
+	<string name="thirty_minutes">30 minutes</string>
+	<string name="one_hour">1 hour</string>
+	<string name="two_hours">2 hours</string>
+	<string name="eight_hours">8 hours</string>
+	<string name="until_further_notice">Until further notice</string>
+	<string name="pref_input_options">Input options</string>
+	<string name="pref_enter_is_send">Enter is send</string>
+	<string name="pref_enter_is_send_summary">Use enter key to send message</string>
+	<string name="pref_display_enter_key">Show enter key</string>
+	<string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string>
+	<string name="audio">audio</string>
+	<string name="video">video</string>
+	<string name="image">image</string>
+	<string name="pdf_document">PDF document</string>
+	<string name="apk">Android App</string>
+	<string name="vcard">Contact</string>
+	<string name="received_x_file">Received %s</string>
+	<string name="disable_foreground_service">Disable foreground service</string>
+	<string name="touch_to_open_conversations">Touch to open Conversations</string>
+	<string name="avatar_has_been_published">Avatar has been published!</string>
+    <string name="sending_x_file">Sending %s</string>
+    <string name="offering_x_file">Offering %s</string>
+    <string name="hide_offline">Hide offline</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d2..80f2bfe6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,27 @@
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
+        <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
+        <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
+        <item name="attr/icon_chat">@drawable/ic_action_chat</item>
+        <item name="attr/icon_copy">@drawable/ic_action_copy</item>
+        <item name="attr/icon_discard">@drawable/ic_action_discard</item>
+        <item name="attr/icon_download">@drawable/ic_action_download</item>
+        <item name="attr/icon_edit">@drawable/ic_action_edit</item>
+        <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+
+        <item name="attr/icon_group">@drawable/ic_action_group</item>
+        <item name="attr/icon_new">@drawable/ic_action_new</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
+        <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_refresh">@drawable/ic_action_refresh</item>
+        <item name="attr/icon_remove">@drawable/ic_action_remove</item>
+        <item name="attr/icon_search">@drawable/ic_action_search</item>
+        <item name="attr/icon_secure">@drawable/ic_action_secure</item>
+        <item name="attr/icon_settings">@drawable/ic_action_settings</item>
+        <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 97874738..2c666baa 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -121,12 +121,19 @@
                     android:key="dont_save_encrypted"
                     android:summary="@string/pref_dont_save_encrypted_summary"
                     android:title="@string/pref_dont_save_encrypted" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="enable_legacy_ssl"
-                    android:summary="@string/pref_enable_legacy_ssl_summary"
-                    android:title="@string/pref_enable_legacy_ssl" />
             </PreferenceCategory>
+	        <PreferenceCategory android:title="@string/pref_input_options">
+		        <CheckBoxPreference
+			        android:defaultValue="false"
+			        android:key="enter_is_send"
+			        android:title="@string/pref_enter_is_send"
+			        android:summary="@string/pref_enter_is_send_summary" />
+		        <CheckBoxPreference
+			        android:defaultValue="false"
+			        android:key="display_enter_key"
+			        android:title="@string/pref_display_enter_key"
+			        android:summary="@string/pref_display_enter_key_summary" />
+	        </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_expert_options_other" >
                 <CheckBoxPreference
                     android:defaultValue="false"