diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 48ec42242..bc313c320 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -73,6 +73,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 			runOnUiThread(() -> {
 				hintOrWarning.setText(errorCode);
 				hintOrWarning.setTextColor(getWarningTextColor());
+				hintOrWarning.setVisibility(View.VISIBLE);
 				publishButton.setText(R.string.publish);
 				enablePublishButton();
 			});
@@ -215,16 +216,15 @@ public class PublishProfilePictureActivity extends XmppActivity {
 				this.support = this.account.getXmppConnection().getFeatures().pep();
 			}
 			if (this.avatarUri == null) {
-				if (this.account.getAvatar() != null
-						|| this.defaultUri == null) {
+				if (this.account.getAvatar() != null || this.defaultUri == null) {
 					this.avatar.setImageBitmap(avatarService().get(account, getPixel(192)));
 					if (this.defaultUri != null) {
-						this.avatar
-								.setOnLongClickListener(this.backToDefaultListener);
+						this.avatar.setOnLongClickListener(this.backToDefaultListener);
 					} else {
 						this.secondaryHint.setVisibility(View.INVISIBLE);
 					}
 					if (!support) {
+						this.hintOrWarning.setVisibility(View.VISIBLE);
 						this.hintOrWarning.setTextColor(getWarningTextColor());
 						if (account.getStatus() == Account.State.ONLINE) {
 							this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
@@ -264,6 +264,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 
 		if (bm == null) {
 			disablePublishButton();
+			this.hintOrWarning.setVisibility(View.VISIBLE);
 			this.hintOrWarning.setTextColor(getWarningTextColor());
 			this.hintOrWarning.setText(R.string.error_publish_avatar_converting);
 			return;
@@ -272,10 +273,10 @@ public class PublishProfilePictureActivity extends XmppActivity {
 		if (support) {
 			enablePublishButton();
 			this.publishButton.setText(R.string.publish);
-			this.hintOrWarning.setText(R.string.publish_avatar_explanation);
-			this.hintOrWarning.setTextColor(getPrimaryTextColor());
+			this.hintOrWarning.setVisibility(View.INVISIBLE);
 		} else {
 			disablePublishButton();
+			this.hintOrWarning.setVisibility(View.VISIBLE);
 			this.hintOrWarning.setTextColor(getWarningTextColor());
 			if (account.getStatus() == Account.State.ONLINE) {
 				this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 46a17b4a5..9caea6716 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -90,7 +90,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:minLines="3"
-            android:text="@string/publish_avatar_explanation"
             android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeBody" />
     </LinearLayout>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 15a87c6b1..a08c8a5c4 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -233,7 +233,6 @@
   <string name="add_back">أضف من جهتك أيضا</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>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index e51419356..7f7cbfca9 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -29,6 +29,7 @@
   <string name="message_decrypting">Дешифроване на съобщението. Моля, изчакайте…</string>
   <string name="pgp_message">Съобщение, шифр. чрез OpenPGP</string>
   <string name="nick_in_use">Псевдонимът вече се използва</string>
+  <string name="invalid_muc_nick">Неправилен псевдоним</string>
   <string name="admin">Администратор</string>
   <string name="owner">Собственик</string>
   <string name="moderator">Модератор</string>
@@ -248,7 +249,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s и още %2$d човека са прочели до тук</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>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 7cc35b4b6..1dc59d2f2 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -246,7 +246,6 @@
   <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>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a73a51282..090f9bd75 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -224,7 +224,6 @@
   <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>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 1283e6182..e3edd2699 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -20,7 +20,6 @@
   <string name="title_activity_sharewith">Mit Unterhaltung teilen</string>
   <string name="title_activity_start_conversation">Unterhaltung beginnen</string>
   <string name="title_activity_choose_contact">Kontakt auswählen</string>
-  <string name="title_activity_share_via_account">Über Account teilen</string>
   <string name="title_activity_block_list">Sperrliste</string>
   <string name="just_now">gerade</string>
   <string name="minute_ago">vor einer Minute</string>
@@ -30,6 +29,7 @@
   <string name="message_decrypting">Nachricht wird entschlüsselt. Bitte warten …</string>
   <string name="pgp_message">OpenPGP-verschlüsselte Nachricht</string>
   <string name="nick_in_use">Nickname wird bereits verwendet</string>
+  <string name="invalid_muc_nick">Ungültiger Nickname</string>
   <string name="admin">Administrator</string>
   <string name="owner">Eigentümer</string>
   <string name="moderator">Moderator</string>
@@ -249,7 +249,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d weitere haben bis zu diesem Punkt gelesen </string>
   <string name="publish">Veröffentlichen</string>
   <string name="touch_to_choose_picture">Avatar antippen, um Bild aus Galerie 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…</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>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 4d2e135d7..e8f8621b0 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -176,7 +176,6 @@
   <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>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 05a1e8db0..c276ffa57 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -29,6 +29,7 @@
   <string name="message_decrypting">Descifrando mensaje. Por favor, espera...</string>
   <string name="pgp_message">Mensaje cifrado con OpenPGP</string>
   <string name="nick_in_use">El apodo ya está en uso</string>
+  <string name="invalid_muc_nick">Apodo inválido</string>
   <string name="admin">Administrador</string>
   <string name="owner">Propietario</string>
   <string name="moderator">Moderador</string>
@@ -248,7 +249,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$dhan 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>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 31f2b819e..580a1914c 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -246,7 +246,6 @@
   <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>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 82c120258..c9c8993d6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -248,7 +248,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s+%2$d et plus  ont tout lu jusqu\'ici</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">Note : toutes les personnes ayant souscrit à vos mises jour de disponibilité verront cette image.</string>
   <string name="publishing">Mise à jour…</string>
   <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre publication</string>
   <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index b508769e9..e65dcccba 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -248,7 +248,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d máis leron ate este punto</string>
   <string name="publish">Publicar</string>
   <string name="touch_to_choose_picture">Toque no avatar para escoller imaxe desde a galería</string>
-  <string name="publish_avatar_explanation">Aviso: todos os suscritos as súas actualizacións de presenza permitiráselle ver esta imaxe.</string>
   <string name="publishing">Publicando...</string>
   <string name="error_publish_avatar_server_reject">O servidor rexeitou a súa publicación</string>
   <string name="error_publish_avatar_converting">Algo fallou mentras se convertía a súa imaxe</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index e85879049..031a87a0d 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -246,7 +246,6 @@
   <string name="contact_has_read_up_to_this_point">%s eddig olvasta</string>
   <string name="publish">Közzétesz</string>
   <string name="touch_to_choose_picture">Érintsd meg a piktogramot kép kiválasztásához </string>
-  <string name="publish_avatar_explanation">Vedd figyelembe: mindenki láthatja a képedet, aki fel van iratkozva rád.</string>
   <string name="publishing">Közzétesz...</string>
   <string name="error_publish_avatar_server_reject">A szerver elutasította a kérésedet</string>
   <string name="error_publish_avatar_converting">Valami hiba történt a képed átalakítása közben</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 1aa2b4c4a..03e697c28 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -199,7 +199,6 @@
   <string name="contact_has_read_up_to_this_point">%s telah membaca hingga disini</string>
   <string name="publish">Publikasi</string>
   <string name="touch_to_choose_picture">Sentuh Avatar untuk memilih gambar dari gallery</string>
-  <string name="publish_avatar_explanation">Harap dicatat: Setiap orang yang berlangganan update kehadiran Anda akan diizinkan untuk melihat gambar ini.</string>
   <string name="publishing">Mempublikasi...</string>
   <string name="error_publish_avatar_server_reject">Server tidak mengijinkan publikasi Anda</string>
   <string name="error_publish_avatar_converting">Sesuatu yang salah terjadi ketika mengkonversi gambar anda</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 23e608d9c..d584716f4 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -246,7 +246,6 @@
   <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>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 9b44994e0..912694541 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -191,7 +191,6 @@
   <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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 65874e2e7..6b2c9e0bb 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -232,7 +232,6 @@
   <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>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 8afae09bb..b1770b9a2 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -226,7 +226,6 @@
   <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>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 1412e3d82..e5222adf0 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -232,7 +232,6 @@
   <string name="contact_has_read_up_to_this_point">%s har lest hit</string>
   <string name="publish">Publiser</string>
   <string name="touch_to_choose_picture">Trykk på avataren for å velge blide fra galleriet</string>
-  <string name="publish_avatar_explanation">Merk, alle som kan se dine tilstedeværelsesoppdateringer vil kunne se dette bildet.</string>
   <string name="publishing">Publiserer…</string>
   <string name="error_publish_avatar_server_reject">Tjeneren avslo din publisering</string>
   <string name="error_publish_avatar_converting">Noe gikk galt under konvertering av bildet ditt</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 75990e4f0..4687f33fe 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -29,6 +29,7 @@
   <string name="message_decrypting">Bericht aan het ontsleutelen. Even geduld…</string>
   <string name="pgp_message">OpenPGP-versleuteld bericht</string>
   <string name="nick_in_use">Naam is al in gebruik</string>
+  <string name="invalid_muc_nick">Ongeldige bijnaam</string>
   <string name="admin">Beheerder</string>
   <string name="owner">Eigenaar</string>
   <string name="moderator">Moderator</string>
@@ -248,7 +249,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s en nog %2$d meer hebben tot hier gelezen</string>
   <string name="publish">Publiceer</string>
   <string name="touch_to_choose_picture">Tik op avatar om een foto uit de galerij te kiezen</string>
-  <string name="publish_avatar_explanation">Let op: 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>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a4989fb9c..7eabcd3d6 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -234,7 +234,6 @@
   <string name="contact_has_read_up_to_this_point">%s przeczytał do tego miejsca</string>
   <string name="publish">Publikuj</string>
   <string name="touch_to_choose_picture">Naciśnij awatar, żeby wybrać obraz z galerii</string>
-  <string name="publish_avatar_explanation">Uwaga: Obraz będzie widoczny dla wszystkich kontaktów, którym udostępniasz powiadomienia o obecności.</string>
   <string name="publishing">Publikowanie...</string>
   <string name="error_publish_avatar_server_reject">Serwer odrzucił żądanie publikacji</string>
   <string name="error_publish_avatar_converting">Wystąpił błąd podczas konwersji obrazu</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index e98f96108..a1825e881 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -29,6 +29,7 @@
   <string name="message_decrypting">Descriptografando a mensagem. Por favor, aguarde...</string>
   <string name="pgp_message">Mensagem criptografada via OpenPGP</string>
   <string name="nick_in_use">Este apelido já está em uso</string>
+  <string name="invalid_muc_nick">Apelido inválido</string>
   <string name="admin">Administrador</string>
   <string name="owner">Dono</string>
   <string name="moderator">Moderador</string>
@@ -244,9 +245,10 @@
   <string name="contact_added_you">O contato foi adicionado à sua lista de contatos</string>
   <string name="add_back">Adicionar novamente</string>
   <string name="contact_has_read_up_to_this_point">%s leu até esse ponto</string>
+  <string name="contacts_have_read_up_to_this_point">%s leu até esse ponto</string>
+  <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d outras pessoas leram até esse ponto</string>
   <string name="publish">Publicar</string>
   <string name="touch_to_choose_picture">Toque o avatar para selecionar uma imagem da galeria</string>
-  <string name="publish_avatar_explanation">Por favor observe: todos aqueles que acompanham suas atualizações de presença poderão ver essa imagem</string>
   <string name="publishing">Publicando...</string>
   <string name="error_publish_avatar_server_reject">O servidor rejeitou sua publicação</string>
   <string name="error_publish_avatar_converting">Ocorreu um erro durante a conversão da sua imagem</string>
@@ -618,6 +620,7 @@
   <string name="missing_presence_subscription_with_x">Sem requisição de atualizações de presença com %s.</string>
   <string name="missing_keys_from_x">Sem chaves OMEMO para %s.</string>
   <string name="missing_omemo_keys">Chaves OMEMO ausentes</string>
+  <string name="wrong_conference_configuration">Esse é uma conversa em grupo não privada e/ou não anônima.</string>
   <string name="this_conference_has_no_members">Esta conversa em grupo não possui participantes.</string>
   <string name="report_jid_as_spammer">Informe que esse JID está enviando mensagens indesejáveis</string>
   <string name="pref_delete_omemo_identities">Excluir identidades OMEMO</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 9db008868..2dadbce05 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -215,7 +215,6 @@
   <string name="contact_has_read_up_to_this_point">%s leu até este ponto</string>
   <string name="publish">Publicar</string>
   <string name="touch_to_choose_picture">Toque no avatar para escolher uma imagem da galeria</string>
-  <string name="publish_avatar_explanation">Por favor note: Todos os subscritos à suas atualizações de presença poderão ver esta imagem.</string>
   <string name="publishing">Publicando...</string>
   <string name="error_publish_avatar_server_reject">O servidor rejeitou a sua publicação</string>
   <string name="error_publish_avatar_converting">Algo deu errado ao converter a sua imagem</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 126fb2b37..39df89f97 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -29,6 +29,7 @@
   <string name="message_decrypting">Decriptez mesaj. Te rog așteaptă...</string>
   <string name="pgp_message">Mesaj criptat cu OpenPGP</string>
   <string name="nick_in_use">Numele de utilizator este deja alocat</string>
+  <string name="invalid_muc_nick">Nume invalid</string>
   <string name="admin">Administrator</string>
   <string name="owner">Proprietar</string>
   <string name="moderator">Moderator</string>
@@ -248,7 +249,6 @@
   <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s și încă %2$d au citit până aici</string>
   <string name="publish">Publică</string>
   <string name="touch_to_choose_picture">Atingeți avatarul pentru a selecta o poză din galerie</string>
-  <string name="publish_avatar_explanation">Țineți minte: Toți cei abonați la actualizările dumneavoastră de prezență vor putea să vadă această poză</string>
   <string name="publishing">Se publică...</string>
   <string name="error_publish_avatar_server_reject">Acest server v-a refuzat publicarea</string>
   <string name="error_publish_avatar_converting">Ceva nu a mers bine în timpul conversiei imaginii</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 76f194558..ff5161f0b 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -240,7 +240,6 @@
   <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>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 568c3e12a..69158b5ec 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -188,7 +188,6 @@
   <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>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 7d5028531..be9c13280 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -231,7 +231,6 @@
   <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>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 3d90d9564..b386d7fd1 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -231,7 +231,6 @@
   <string name="contact_has_read_up_to_this_point">%s har läst 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">Publicerar…</string>
   <string name="error_publish_avatar_server_reject">Servern kunde inte publicera</string>
   <string name="error_publish_avatar_converting">Något gick fel vid konvertering av din bild</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 76a05ebbb..458424c4b 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -227,7 +227,6 @@
   <string name="contact_has_read_up_to_this_point">%s buraya kadar okudu</string>
   <string name="publish">Yayımla</string>
   <string name="touch_to_choose_picture">Galeriden resim seçmek için avatara dokun</string>
-  <string name="publish_avatar_explanation">Lütfen dikkat: Çevrim içi durum bildirimi güncellemelerinize abone olan herkes bu resmi görebilir.</string>
   <string name="publishing">Yayımlanıyor…</string>
   <string name="error_publish_avatar_server_reject">Sunucu yayımladığınızı reddetti</string>
   <string name="error_publish_avatar_converting">Resim dönüştürülürken hata oluştu</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index f5be52909..2454a5198 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -232,7 +232,6 @@
   <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>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index c80e9d313..e4637d65d 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -226,7 +226,6 @@
   <string name="contact_has_read_up_to_this_point">%s đã đọc đến điểm này</string>
   <string name="publish">Đăng</string>
   <string name="touch_to_choose_picture">Chạm ảnh đại diện để chọn hình từ bộ sưu tập</string>
-  <string name="publish_avatar_explanation">Xin chú ý: Ai đã đăng ký nhận cập nhật hiện diện của bạn sẽ có quyền xem hình này.</string>
   <string name="publishing">Đang đăng...</string>
   <string name="error_publish_avatar_server_reject">Máy chủ đã từ chối đăng tải của bạn</string>
   <string name="error_publish_avatar_converting">Đã xảy ra lỗi khi chuyển đổi hình của bạn</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index ca3c70ee0..e3857bedb 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -232,7 +232,6 @@
   <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>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 61f900779..37df6faa5 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -231,7 +231,6 @@
   <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>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7a1f12203..d0a1f85ba 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -251,7 +251,6 @@
 	<string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d more have read up to this point</string>
 	<string name="publish">Publish</string>
 	<string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
-	<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
 	<string name="publishing">Publishing…</string>
 	<string name="error_publish_avatar_server_reject">The server rejected your publication</string>
 	<string name="error_publish_avatar_converting">Something went wrong while converting your picture</string>