Merge branch 'siacs/master' into development

26 files changed, 193 insertions, 37 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 52a862efa..cf49cf65e 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -23,7 +23,7 @@ public class MucOptions {
 		OUTCAST("outcast", 0, R.string.outcast),
 		NONE("none", 1, R.string.no_affiliation);
 
-		private Affiliation(String string, int rank, int resId) {
+		Affiliation(String string, int rank, int resId) {
 			this.string = string;
 			this.resId = resId;
 			this.rank = rank;
@@ -52,18 +52,20 @@ public class MucOptions {
 	}
 
 	public enum Role {
-		MODERATOR("moderator", R.string.moderator),
-		VISITOR("visitor", R.string.visitor),
-		PARTICIPANT("participant", R.string.participant),
-		NONE("none", R.string.no_role);
+		MODERATOR("moderator", R.string.moderator,3),
+		VISITOR("visitor", R.string.visitor,1),
+		PARTICIPANT("participant", R.string.participant,2),
+		NONE("none", R.string.no_role,0);
 
-		private Role(String string, int resId) {
+		private Role(String string, int resId, int rank) {
 			this.string = string;
 			this.resId = resId;
+			this.rank = rank;
 		}
 
 		private String string;
 		private int resId;
+		private int rank;
 
 		public int getResId() {
 			return resId;
@@ -73,6 +75,10 @@ public class MucOptions {
 		public String toString() {
 			return this.string;
 		}
+
+		public boolean ranks(Role role) {
+			return rank >= role.rank;
+		}
 	}
 
 	public static final int ERROR_NO_ERROR = 0;
@@ -233,6 +239,10 @@ public class MucOptions {
 		 return !membersOnly() || self.getAffiliation().ranks(Affiliation.ADMIN);
 	}
 
+	public boolean participating() {
+		return !online() || self.getRole().ranks(Role.PARTICIPANT);
+	}
+
 	public boolean membersOnly() {
 		return hasFeature("muc_membersonly");
 	}
@@ -245,6 +255,10 @@ public class MucOptions {
 		return hasFeature("muc_persistent");
 	}
 
+	public boolean moderated() {
+		return hasFeature("muc_moderated");
+	}
+
 	public void deleteUser(String name) {
 		for (int i = 0; i < users.size(); ++i) {
 			if (users.get(i).getName().equals(name)) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index aa65c4aff..95c39d25c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -102,11 +102,29 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			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();
+			final String[] options;
+			final boolean[] values;
+			if (mAdvancedMode) {
+				options = new String[]{
+						getString(R.string.members_only),
+						getString(R.string.moderated),
+						getString(R.string.non_anonymous)
+				};
+				values = new boolean[]{
+						mucOptions.membersOnly(),
+						mucOptions.moderated(),
+						mucOptions.nonanonymous()
+				};
+			} else {
+				options = new String[]{
+						getString(R.string.members_only),
+						getString(R.string.non_anonymous)
+				};
+				values = new boolean[]{
+						mucOptions.membersOnly(),
+						mucOptions.nonanonymous()
+				};
+			}
 			builder.setMultiChoiceItems(options,values,new DialogInterface.OnMultiChoiceClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which, boolean isChecked) {
@@ -124,7 +142,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 					}
 					Bundle options = new Bundle();
 					options.putString("muc#roomconfig_membersonly", values[0] ? "1" : "0");
-					options.putString("muc#roomconfig_whois", values[1] ? "anyone" : "moderators");
+					if (values.length == 2) {
+						options.putString("muc#roomconfig_whois", values[1] ? "anyone" : "moderators");
+					} else if (values.length == 3) {
+						options.putString("muc#roomconfig_moderatedroom", values[1] ? "1" : "0");
+						options.putString("muc#roomconfig_whois", values[2] ? "anyone" : "moderators");
+					}
 					options.putString("muc#roomconfig_persistentroom", "1");
 					xmppConnectionService.pushConferenceConfiguration(mConversation,
 							options,
@@ -193,6 +216,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 						});
 			}
 		});
+		this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
 	}
 
 	@Override
@@ -215,6 +239,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.action_advanced_mode:
 				this.mAdvancedMode = !menuItem.isChecked();
 				menuItem.setChecked(this.mAdvancedMode);
+				getPreferences().edit().putBoolean("advanced_muc_mode", mAdvancedMode).commit();
 				invalidateOptionsMenu();
 				updateView();
 				break;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 17faaf383..986abf6a5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -417,7 +417,7 @@ public class ConversationActivity extends XmppActivity
 				}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
-					menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable());
+					menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable() && getSelectedConversation().getMucOptions().participating());
 					menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite());
                     menuSecure.setVisible(!Config.HIDE_ENCRYPTION_IN_UI);
 					menuSecure.setVisible(!Config.HIDE_PGP_IN_UI); //if pgp is hidden conferences have no choice of encryption
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index dbeec42ac..8f12b14ce 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -320,11 +320,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	}
 
 	public void updateChatMsgHint() {
-		if (conversation.getMode() == Conversation.MODE_MULTI
-				&& conversation.getNextCounterpart() != null) {
+		final boolean multi = conversation.getMode() == Conversation.MODE_MULTI;
+		if (multi && conversation.getNextCounterpart() != null) {
 			this.mEditMessage.setHint(getString(
 					R.string.send_private_message_to,
 					conversation.getNextCounterpart().getResourcepart()));
+		} else if (multi && !conversation.getMucOptions().participating()) {
+			this.mEditMessage.setHint(R.string.you_are_not_participating);
 		} else {
 			switch (conversation.getNextEncryption()) {
 				case Message.ENCRYPTION_NONE:
@@ -664,6 +666,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		if (this.conversation.getMode() == Conversation.MODE_MULTI) {
 			this.conversation.setNextCounterpart(null);
 		}
+		boolean canWrite = this.conversation.getMode() == Conversation.MODE_SINGLE || this.conversation.getMucOptions().participating();
+		this.mEditMessage.setEnabled(canWrite);
+		this.mSendButton.setEnabled(canWrite);
 		this.mEditMessage.setKeyboardListener(null);
 		this.mEditMessage.setText("");
 		this.mEditMessage.append(this.conversation.getNextMessage());
diff --git a/src/main/java/eu/siacs/conversations/utils/Xmlns.java b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
index 868566d96..de0a29ce2 100644
--- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java
+++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
@@ -5,5 +5,5 @@ public final class Xmlns {
 	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";
-	public static final String HTTP_UPLOAD = "eu:siacs:conversations:http:upload";
+	public static final String HTTP_UPLOAD = "urn:xmpp:http:upload";
 }
diff --git a/src/main/res/values-ar-rEG/strings.xml b/src/main/res/values-ar-rEG/strings.xml
index b8a18cde1..55465f36e 100644
--- a/src/main/res/values-ar-rEG/strings.xml
+++ b/src/main/res/values-ar-rEG/strings.xml
@@ -284,7 +284,6 @@
   <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>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 88ba9b975..25af98170 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -408,7 +408,6 @@
   <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>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index bfa73a47b..5eee38c88 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -379,7 +379,6 @@
   <string name="public_conference">Comferència de la conversació  d\'accés pùblic</string>
   <string name="private_conference">Privada, únicament els membres de la conferència de conversació</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>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a1eae713c..8d0c6a792 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -76,6 +76,7 @@
   <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_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
   <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
   <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
@@ -149,6 +150,7 @@
   <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_unencrypted">Nešifrováno</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -186,6 +188,8 @@
   <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 / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</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>
@@ -365,6 +369,8 @@
   <string name="purge_key">Vymazat klíč</string>
   <string name="purge_key_desc_part1">Opravdu si přejete vymazat tento klíč?</string>
   <string name="purge_key_desc_part2">Bude neodvolatelně pokládán jako kompromitovaný a již s jeho pomocí nebudete moci nikdy spustit jiné sezení.</string>
+  <string name="error_no_keys_to_trust">Pro tento kontakt nejsou dostupné žádné použitelné klíče. Pokud jste smazali jakýkoliv z jeho klíčů bude třeba vygenerovat nové.</string>
+  <string name="error_trustkeys_title">Chyba</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>
@@ -402,7 +408,6 @@
   <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>
@@ -475,4 +480,6 @@
   <string name="download_failed_server_not_found">Stahování selhalo: Server nenalezen</string>
   <string name="download_failed_file_not_found">Stahování selhalo: Soubor nenalezen</string>
   <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string>
+  <string name="pref_use_white_background">Použít bílé pozadí</string>
+  <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 1171c28fa..f9e958b86 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -408,7 +408,6 @@
   <string name="public_conference">Öffentlich zugängliche Konferenz</string>
   <string name="private_conference">Private Konferenz nur für Mitglieder</string>
   <string name="conference_options">Konferenz-Optionen</string>
-  <string name="members_only">Privat (Nur für Mitglieder)</string>
   <string name="non_anonymous">De-anonymisiert</string>
   <string name="modified_conference_options">Konferenz-Optionen wurden modifiziert!</string>
   <string name="could_not_modify_conference_options">Konferenz-Optionen konnten nicht modifiziert werden</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index a9ae5cbda..88c3f6d6d 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -379,7 +379,6 @@
   <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>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ff11ead35..7edd598ba 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -408,7 +408,6 @@
   <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>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 9c99d7cf7..5af10b9c8 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -188,6 +188,8 @@
   <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 / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</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>
@@ -406,7 +408,6 @@
   <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>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 643bfd103..8ccd8aacf 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -76,7 +76,9 @@
   <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_unencrypted_message">Envoyer un message non chiffré</string>
   <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
+  <string name="send_omemo_message">Envoyé un message chiffré avec OMEMO</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="send_unencrypted">Envoyer en clair</string>
@@ -104,6 +106,8 @@
   <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 dans les conférences publiques</string>
+  <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message dans une conférence publique, même si votre nom n\'y apparaît pas</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>
@@ -146,8 +150,10 @@
   <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_unencrypted">Non chiffré</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</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>
@@ -182,6 +188,8 @@
   <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 / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: Envoi de fichiers via HTTP</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>
@@ -199,6 +207,13 @@
   <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="omemo_fingerprint">Empreinte OMEMO</string>
+  <string name="omemo_fingerprint_selected_message">Empreinte OMEMO du message</string>
+  <string name="this_device_omemo_fingerprint">Votre empreinte OMEMO</string>
+  <string name="other_devices">Autres appareils</string>
+  <string name="trust_omemo_fingerprints">Faire confiance aux empreintes OMEMO</string>
+  <string name="fetching_keys">Récupération des clés</string>
+  <string name="done">Fait</string>
   <string name="verify">Vérifier</string>
   <string name="decrypt">Déchiffrer</string>
   <string name="conferences">Conférences</string>
@@ -279,15 +294,19 @@
   <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="toast_message_omemo_fingerprint">Empreinte OMEMO 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_x">Vérification de %s sur l\'hôte HTTP</string>
   <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
+  <string name="check_x_filesize">Récupération de la taille de %s</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="file_url">URL du fichier</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>
@@ -342,6 +361,16 @@
   <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="copy_omemo_clipboard_description">Copier l\'empreinte OMEMO dans le presse-papier</string>
+  <string name="regenerate_omemo_key">Régénérer l\'empreinte OMEMO</string>
+  <string name="wipe_omemo_pep">Effacer les autres appareils de PEP</string>
+  <string name="clear_other_devices">Vider les appareils</string>
+  <string name="clear_other_devices_desc">Etes vous sur de vouloir supprimer les autres appareils de l\'annonce PEP ? A leur prochaine connexion, ils s\'annonceront à nouveau, mais ils peuvent ne pas recevoir les messages reçus entre temps.</string>
+  <string name="purge_key">Supprimer la clé</string>
+  <string name="purge_key_desc_part1">Etes vous sur de vouloir supprimer cette clé ?</string>
+  <string name="purge_key_desc_part2">Elle sera considérée compromise de manière irréversible, et vous ne pourrez plus générer de session avec.</string>
+  <string name="error_no_keys_to_trust">il n\'y a pas de clé disponible pour ce contact. Si vous avez purgé toutes ses clés, ils doivent en générer de nouvelles.</string>
+  <string name="error_trustkeys_title">Erreur</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>
@@ -349,6 +378,7 @@
   <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 que personne d\'autre ne connait (comme une blague ou simplement ce que vous avez mangé avec lui lors de votre dernière rencontre) vous pouvez utiliser ce secret pour vérifier vos empreintes.\n\nVous posez votre question à votre contact, qui répondra avec une réponse sensible à 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>
@@ -378,7 +408,6 @@
   <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>
@@ -417,8 +446,38 @@
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
   <string name="location">Position</string>
   <string name="received_location">Position reçue</string>
+  <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
+  <string name="title_undo_swipe_out_muc">Conférence quittée</string>
+  <string name="pref_dont_trust_system_cas_title">Ne pas faire confiance aux CAs système</string>
+  <string name="pref_dont_trust_system_cas_summary">Tous les certificats doivent être approuvés manuellement</string>
+  <string name="pref_remove_trusted_certificates_title">Retirer les certificats</string>
+  <string name="pref_remove_trusted_certificates_summary">Supprimer les certificats approuvés manuellement</string>
+  <string name="toast_no_trusted_certs">Aucun certificat approuvé manuellement</string>
+  <string name="dialog_manage_certs_title">Retirer les certificats</string>
+  <string name="dialog_manage_certs_positivebutton">Supprimer la sélection</string>
+  <string name="dialog_manage_certs_negativebutton">Annuler</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="one">%d certificat supprimé</item>
+    <item quantity="other">%d certificats supprimés</item>
+  </plurals>
   <plurals name="select_contact">
     <item quantity="one">%d contact séléctionné</item>
     <item quantity="other">%d contacts séléctionnés</item>
   </plurals>
+  <string name="pref_quick_action_summary">Remplacer le bouton envoyer avec une action rapide</string>
+  <string name="pref_quick_action">Action Rapide</string>
+  <string name="none">Aucune</string>
+  <string name="recently_used">Dernière utilisée</string>
+  <string name="choose_quick_action">Sélectionner l\'action rapide</string>
+  <string name="search_for_contacts_or_groups">Rechercher des contacts ou des groupes</string>
+  <string name="send_private_message">Envoyer un message privé</string>
+  <string name="user_has_left_conference">%s a quitté la conférence</string>
+  <string name="username">Nom d\'utilisateur</string>
+  <string name="username_hint">Nom d\'utilisateur</string>
+  <string name="invalid_username">Ce n\'est pas un nom d\'utilisateur valide</string>
+  <string name="download_failed_server_not_found">Échec du téléchargement: Serveur non trouvé</string>
+  <string name="download_failed_file_not_found">Échec du téléchargement: Fichier non trouvé</string>
+  <string name="download_failed_could_not_connect">Échec du téléchargement: Impossible de se connecter au serveur</string>
+  <string name="pref_use_white_background">Utiliser un fond blanc</string>
+  <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index a016b704b..dde7c88d3 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -384,7 +384,6 @@
   <string name="public_conference">Conference umum</string>
   <string name="private_conference">Rahasia, hanya member conference</string>
   <string name="conference_options">Opsi conference</string>
-  <string name="members_only">Rahasia (Hanya member)</string>
   <string name="non_anonymous">Non Anonymous</string>
   <string name="modified_conference_options">Opsi conference dimodifikasi!</string>
   <string name="could_not_modify_conference_options">Tidak dapat merubah pengaturan conference</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 2376285b0..210e6e8ae 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -380,7 +380,6 @@
   <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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index adba1e983..662778943 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">メッセージを削除</string>
   <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">連絡する参加を選択</string>
+  <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
   <string name="send_omemo_message">OMEMO 暗号化メッセージを送信</string>
   <string name="send_pgp_message">OpenPGP 暗号化メッセージを送信</string>
@@ -149,6 +150,7 @@
   <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_unencrypted">暗号化されていない</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -186,6 +188,8 @@
   <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: PEP (アバター / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP ファイルアップロード</string>
   <string name="server_info_available">利用可能</string>
   <string name="server_info_unavailable">利用不可</string>
   <string name="missing_public_keys">公開鍵の通知がありません</string>
@@ -365,6 +369,8 @@
   <string name="purge_key">鍵を消去</string>
   <string name="purge_key_desc_part1">この鍵を消去してもよろしいですか?</string>
   <string name="purge_key_desc_part2">これは不可逆的に侵害とみなされ、あなたは再びそのセッションを構築することはできません。</string>
+  <string name="error_no_keys_to_trust">この連絡先で利用可能な鍵はありません。あなたがその鍵を消去している場合は、新しいものを生成してもらう必要があります。</string>
+  <string name="error_trustkeys_title">エラー</string>
   <string name="fetching_history_from_server">サーバーから履歴を取得中</string>
   <string name="no_more_history_on_server">サーバーにこれ以上履歴はありません</string>
   <string name="updating">アップデート中…</string>
@@ -402,7 +408,6 @@
   <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>
@@ -471,4 +476,6 @@
   <string name="download_failed_server_not_found">ダウンロードに失敗しました: サーバーが見つかりません</string>
   <string name="download_failed_file_not_found">ダウンロードに失敗しました: ファイルが見つかりません</string>
   <string name="download_failed_could_not_connect">ダウンロードに失敗しました: ホストに接続できませんでした</string>
+  <string name="pref_use_white_background">白い背景を使用する</string>
+  <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 1ce1cd43d..89fb3874f 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -379,7 +379,6 @@
   <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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a44dbf511..099f8bd78 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Berichten verwijderen</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_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
   <string name="send_pgp_message">Verstuur OpenPGP-versleuteld bericht</string>
@@ -149,6 +150,7 @@
   <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_unencrypted">Onversleuteld</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -186,6 +188,8 @@
   <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 / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</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>
@@ -365,6 +369,8 @@
   <string name="purge_key">Sleutel verwijderen</string>
   <string name="purge_key_desc_part1">Ben je zeker dat je deze sleutel wil verwijderen?</string>
   <string name="purge_key_desc_part2">Ze zal onherroepelijk beschouwd worden als gecompromitteerd en je zal er nooit meer een nieuwe sessie mee kunnen bouwen.</string>
+  <string name="error_no_keys_to_trust">Er zijn geen bruikbare sleutels beschikbaar voor dit contact. Als je zijn/haar sleutels hebt verwijderd dient hij/zij nieuwe aan te maken.</string>
+  <string name="error_trustkeys_title">Fout</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>
@@ -402,7 +408,6 @@
   <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>
@@ -473,4 +478,6 @@
   <string name="download_failed_server_not_found">Downloaden mislukt: server niet gevonden</string>
   <string name="download_failed_file_not_found">Downloaden mislukt: bestand niet gevonden</string>
   <string name="download_failed_could_not_connect">Downloaden mislukt: kon geen verbinding maken met host</string>
+  <string name="pref_use_white_background">Gebruik witte achtergrond</string>
+  <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 0601b4a14..0ea0ab577 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Usuń wiadomości</string>
   <string name="also_end_conversation">Zakończ konwersację po usunięciu historii</string>
   <string name="choose_presence">Wybierz widoczność dla kontaktu</string>
+  <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
   <string name="send_otr_message">Wyślij zaszyfrowaną wiadomość (OTR)</string>
   <string name="send_pgp_message">Wyślij zaszyfrowaną wiadomość (OpenPGP)</string>
   <string name="your_nick_has_been_changed">Twoja nazwa została zmieniona</string>
@@ -104,6 +105,7 @@
   <string name="pref_vibrate_summary">Wibruj, gdy nadejdzie wiadomość</string>
   <string name="pref_sound">Dźwięk</string>
   <string name="pref_sound_summary">Odtwórz dźwięk z powiadomieniem</string>
+  <string name="pref_conference_notifications">Powiadomienia konfrencji</string>
   <string name="pref_notification_grace_period">Opóźnienie powiadomień</string>
   <string name="pref_notification_grace_period_summary">Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości</string>
   <string name="pref_advanced_options">Opcje zaawansowane</string>
@@ -146,8 +148,10 @@
   <string name="account_status_regis_not_sup">Serwer nie umożliwia rejestracji</string>
   <string name="account_status_security_error">Błąd zabezpieczeń</string>
   <string name="account_status_incompatible_server">Serwer niekompatybilny</string>
+  <string name="encryption_choice_unencrypted">Bez szyfrowania</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
   <string name="mgmt_account_edit">Edytuj konto</string>
   <string name="mgmt_account_delete">Usuń konto</string>
   <string name="mgmt_account_disable">Wyłącz tymczasowo</string>
@@ -182,6 +186,8 @@
   <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 (Awatary / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: Przesyłanie plików przez HTTP</string>
   <string name="server_info_available">dostępny</string>
   <string name="server_info_unavailable">niedostępny</string>
   <string name="missing_public_keys">Brak informacji o kluczu publicznym</string>
@@ -200,6 +206,8 @@
   <string name="your_fingerprint">Twój odcisk klucza</string>
   <string name="otr_fingerprint">Odcisk klucza OTR</string>
   <string name="other_devices">Pozostałe urządzenia</string>
+  <string name="fetching_keys">Pobieranie kluczy...</string>
+  <string name="done">Ukończono</string>
   <string name="verify">Weryfikuj</string>
   <string name="decrypt">Odszyfruj</string>
   <string name="conferences">Konferencje</string>
@@ -280,15 +288,19 @@
   <string name="pref_conference_name">Nazwa konferencji</string>
   <string name="pref_conference_name_summary">Nazywaj konferencję tematem zamiast Jabber ID</string>
   <string name="toast_message_otr_fingerprint">Odcisk klucza OTR został skopiowany do schowka</string>
+  <string name="toast_message_omemo_fingerprint">Odcisk klucza OMEMO został skopiowany do schowka!</string>
   <string name="conference_banned">Zbanowano cię w konferencji</string>
   <string name="conference_members_only">To jest zamknięty pokój</string>
   <string name="conference_kicked">Wyrzucono cię z konferencji</string>
   <string name="using_account">używając konta %s</string>
+  <string name="checking_x">Sprawdzanie %s na hoście HTTP</string>
   <string name="not_connected_try_again">Brak połączenia. Spróbuj ponownie później</string>
+  <string name="check_x_filesize">Sprawdź rozmiar %s</string>
   <string name="message_options">Opcje wiadomości</string>
   <string name="copy_text">Skopiuj tekst</string>
   <string name="copy_original_url">Skopiuj oryginalny URL</string>
   <string name="send_again">Wyślij ponownie</string>
+  <string name="file_url">URL pliku</string>
   <string name="message_text">Treść wiadomości</string>
   <string name="url_copied_to_clipboard">URL obrazu został skopiowany do schowka</string>
   <string name="message_copied_to_clipboard">Wiadomość została skopiowana do schowka</string>
@@ -343,6 +355,12 @@
   <string name="reset">Resetuj</string>
   <string name="account_image_description">Awatar konta</string>
   <string name="copy_otr_clipboard_description">Skopiuj odcisk klucza OTR do schowka</string>
+  <string name="copy_omemo_clipboard_description">Skopiuj odcisk klucza OMEMO do schowka</string>
+  <string name="regenerate_omemo_key">Wygeneruj ponownie klucz OMEMO</string>
+  <string name="clear_other_devices">Wyczyść urządzenia</string>
+  <string name="purge_key">Skasuj klucz</string>
+  <string name="purge_key_desc_part1">Czy na pewno chcesz skasować usunąć odcisk klucza?</string>
+  <string name="error_trustkeys_title">Błąd</string>
   <string name="fetching_history_from_server">Pobieranie historii z serwera</string>
   <string name="no_more_history_on_server">Koniec historii na serwerze</string>
   <string name="updating">Aktualizowanie...</string>
@@ -380,7 +398,6 @@
   <string name="public_conference">Konferencja publiczna</string>
   <string name="private_conference">Konferencja prywatna, dla zaakceptowanych uczestników</string>
   <string name="conference_options">Opcje konferencji</string>
-  <string name="members_only">Prywatna (tylko zaakceptowani)</string>
   <string name="non_anonymous">Nieanonimowa</string>
   <string name="modified_conference_options">Opcje konferencji zostały zmienione!</string>
   <string name="could_not_modify_conference_options">Nie udało się zmienić opcji konferencji</string>
@@ -444,5 +461,15 @@
   <string name="none">Brak</string>
   <string name="recently_used">Ostatnio używana</string>
   <string name="choose_quick_action">Wybierz szybką akcję</string>
+  <string name="search_for_contacts_or_groups">Szukaj kontaktów i grup</string>
+  <string name="send_private_message">Wyślij wiadomość prywatną</string>
   <string name="user_has_left_conference">%s opuścił(a) konferencję!</string>
+  <string name="username">Nazwa użytkownika</string>
+  <string name="username_hint">Nazwa użytkownika</string>
+  <string name="invalid_username">Błędna nazwa użytkownika</string>
+  <string name="download_failed_server_not_found">Pobieranie nieudane: Nie odnaleziono serwera</string>
+  <string name="download_failed_file_not_found">Pobieranie nieudane: Nie odnaleziono pliku</string>
+  <string name="download_failed_could_not_connect">Pobieranie nieudane: Nie można połączyć z hostem</string>
+  <string name="pref_use_white_background">Białe tło</string>
+  <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a79d5f0af..0b8f15057 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Удалить сообщения</string>
   <string name="also_end_conversation">Завершить беседу</string>
   <string name="choose_presence">Укажите статус для контакта</string>
+  <string name="send_unencrypted_message">Отправить незащифрованное сообщение</string>
   <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
   <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
   <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
@@ -146,6 +147,7 @@
   <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_unencrypted">Без шифра</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">Редактировать аккаунт</string>
@@ -199,6 +201,13 @@
   <string name="reception_failed">Прием не удался</string>
   <string name="your_fingerprint">Контрольная сумма</string>
   <string name="otr_fingerprint">OTR контрольная сумма</string>
+  <string name="omemo_fingerprint">OMEMO контрольная сумма</string>
+  <string name="omemo_fingerprint_selected_message">OMEMO контрольная сумма сообщения</string>
+  <string name="this_device_omemo_fingerprint">Собственная OMEMO контрольная сумма</string>
+  <string name="other_devices">Другие устройства</string>
+  <string name="trust_omemo_fingerprints">Доверенные контрольные суммы OMEMO</string>
+  <string name="fetching_keys">Получение ключей...</string>
+  <string name="done">Готово</string>
   <string name="verify">Подтвердить</string>
   <string name="decrypt">Дешифровать</string>
   <string name="conferences">Конференции</string>
@@ -342,6 +351,11 @@
   <string name="reset">Сброс</string>
   <string name="account_image_description">Изображение учётной записи</string>
   <string name="copy_otr_clipboard_description">Скопировать OTR-отпечаток в буфер обмена</string>
+  <string name="copy_omemo_clipboard_description">Скопировать OMEMO-отпечаток в буфер обмена</string>
+  <string name="regenerate_omemo_key">Создать заново ключ OMEMO</string>
+  <string name="wipe_omemo_pep">Стереть другие устройства из PEP</string>
+  <string name="clear_other_devices">Очистить устройства</string>
+  <string name="clear_other_devices_desc">Вы уверены, что хотите очистить все остальные устройства из анонса ключей OMEMO? При соединении устройств в следующий раз новые ключи анонсируются автоматически, но устройства могут не получить сообщения, посланные до этого.</string>
   <string name="fetching_history_from_server">Получение истории с сервера</string>
   <string name="no_more_history_on_server">На сервере больше нет истории</string>
   <string name="updating">Обновление...</string>
@@ -379,7 +393,6 @@
   <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>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index cc1b9ccbb..892374d77 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -381,7 +381,6 @@
   <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>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b443d5b53..b202b0b6d 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -188,6 +188,8 @@
   <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: PEP (аватари/ОМЕМО)</string>
+  <string name="server_info_http_upload">XEP-0363: ХТТП отпремање фајлова</string>
   <string name="server_info_available">доступан</string>
   <string name="server_info_unavailable">недоступан</string>
   <string name="missing_public_keys">Недостају објаве јавног кључа</string>
@@ -406,7 +408,6 @@
   <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>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index ebbe6ebdb..114be5a1d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -408,7 +408,6 @@
   <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>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 96f6189d8..5b65d7bf7 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -381,7 +381,6 @@
   <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>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4ed498179..3d6328518 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -440,8 +440,10 @@
 	<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="members_only">Private, members only</string>
 	<string name="non_anonymous">Non-anonymous</string>
+	<string name="moderated">Moderated</string>
+	<string name="you_are_not_participating">You are not participating</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>