diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 990d0b237..96dc730cb 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index 57ba10be6..362f56848 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index 8afa9689c..2b75fab38 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -553,7 +553,7 @@ "message": "Quan inclogueu un adjunt que no sigui una imatge, el límit és un adjunt per missatge.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "No podeu barrejar adjunts d'imatge i de no imatge en un mateix missatge.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 4a62d77cc..73e7b7ee1 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/da/messages.json b/_locales/da/messages.json index e7dec3fdd..c82685392 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -553,7 +553,7 @@ "message": "Når der indgår en vedhæftet fil uden billed, er grænsen en vedhæftet fil pr. besked.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kan ikke blande ikke-billed og billedvedhæftninger i en besked.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/de/messages.json b/_locales/de/messages.json index bf173d292..13527f981 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -553,7 +553,7 @@ "message": "Mehrere Anhänge je Nachricht sind ausschließlich bei Bildern erlaubt.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kannst Bilder nicht gemeinsam mit anderen Anhängen in einer Nachricht kombinieren.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/el/messages.json b/_locales/el/messages.json index a9cd493dd..151786b84 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -553,7 +553,7 @@ "message": "Για συνημμένα αρχεία που δεν είναι εικόνες, το όριο είναι ένα αρχείο ανά μήνυμα.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Δεν είναι δυνατό να συνάψετε εικόνες μαζί με αρχεία άλλου τύπου στο ίδιο μήνυμα.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 9b8c5e255..a325d6e95 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -650,7 +650,7 @@ "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" @@ -1119,12 +1119,12 @@ "message": "Show members" }, "resetSession": { - "message": "Reset session", + "message": "Reset Session", "description": "This is a menu item for resetting the session, using the imperative case, as in a command." }, "showSafetyNumber": { - "message": "View safety number" + "message": "View Safety Number" }, "viewAllMedia": { "message": "View all media", @@ -1756,7 +1756,7 @@ "description": "Conversation menu option to enable disappearing messages" }, "changeNickname": { - "message": "Change nickname", + "message": "Change Nickname", "description": "Conversation menu option to change user nickname" }, "clearNickname": { @@ -2088,10 +2088,10 @@ } }, "blockUser": { - "message": "Block user" + "message": "Block User" }, "unblockUser": { - "message": "Unblock user" + "message": "Unblock User" }, "settingsUnblockHeader": { "message": "Blocked Users", diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index 98904a09a..1567ebc0c 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -553,7 +553,7 @@ "message": "Kiam oni enmetas nebildan kunsendaĵon, limo estas po unu kunsendaĵo mesaĝe.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Vi ne povas kunmeti nebildajn kaj bildajn kunsendaĵojn en unu mesaĝo.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 623ed7c13..de03493fe 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -553,7 +553,7 @@ "message": "Al incluír un adjunto que no es una imagen, el límite es un adjunto por mensaje.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "No se pueden combinar adjuntos de otro tipo junto a imágenes.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/et/messages.json b/_locales/et/messages.json index 4633d5074..d140d7e1f 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -553,7 +553,7 @@ "message": "Mittepildilisi manuseid sõnumile lisades kehtiv ühe manuse piirang.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Piltmanuseid ja teisi manuseid ei saa koos ühte sõnumisse panna.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 5b5469999..57bf1aa29 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index f88014578..c418ad860 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -553,7 +553,7 @@ "message": "Muille kuin kuvatiedostoille raja on yksi liitetiedosto per viesti.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Kuvatiedostoa ja muun tyyppistä liitetiedostoa ei voi lisätä samaan viestiin.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 07f69fefb..ea1008964 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -553,7 +553,7 @@ "message": "Pour un fichier joint qui n’est pas une image, la limite est un fichier joint par message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Vous ne pouvez pas joindre à la fois image et non image dans le même message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 6f204e5fd..90d85f76e 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -553,7 +553,7 @@ "message": "בעת הכללת צרופת אי־תמונה, המגבלה היא צרופה אחת להודעה.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "אינך יכול לערבב צרופות של אי־תמונה ותמונה בהודעה אחת.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index 2cb546554..9a5c1466c 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index d9f250898..8182e9512 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index c3f6dde18..f3a936835 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -553,7 +553,7 @@ "message": "Nem-kép csatolmány esetén üzenetenként egy melléklet csatolható.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Nem keverheted a nem-kép és kép típusú csatolmányokat üzeneten belül.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/id/messages.json b/_locales/id/messages.json index 8444f4694..c12a7adbf 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -553,7 +553,7 @@ "message": "Ketika menyertakan lampiran bukan gambar, batasnya adalah satu lampiran per pesan.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Anda tidak bisa mencampur lampiran gambar dan bukan gambar dalam satu pesan.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/it/messages.json b/_locales/it/messages.json index 10ebb91f9..999f01e0c 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -553,7 +553,7 @@ "message": "Quando includi un allegato che non è un'immagine, il limite è un solo allegato per messaggio.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Non puoi allegare insieme immagini ad altri file in un messaggio.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index 4428ce739..634d0ce63 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/km/messages.json b/_locales/km/messages.json index 3063cb176..797605481 100644 --- a/_locales/km/messages.json +++ b/_locales/km/messages.json @@ -553,7 +553,7 @@ "message": "ពេលបញ្ចូលឯកសារភ្ជាប់មិន-រូបភាពមួយ ការកំណត់គឺឯកសារភ្ជាប់មួយ សម្រាប់សារមួយ។", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "អ្នកមិនអាចលាយឡំឯកសារភ្ជាប់ មិន-រូបភាព និងរូបភាព ក្នុងសារតែមួយទេ។", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index 060936e14..fbf60b792 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 87d8210ea..0eaee0388 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json index 0b3fa133b..07b18f080 100644 --- a/_locales/lt/messages.json +++ b/_locales/lt/messages.json @@ -553,7 +553,7 @@ "message": "Įtraukiant ne paveikslų priedus, vienoje žinutėje galimas tik vienas priedas.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Negalite vienoje žinutėje maišyti paveikslų ir ne paveikslų priedus.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index 96f9489c9..3287678d0 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json index c65db64e5..b6e491992 100644 --- a/_locales/nb/messages.json +++ b/_locales/nb/messages.json @@ -553,7 +553,7 @@ "message": "Når du inkluderer et vedlegg som ikke er et bilde, er begrensningen ett vedlegg per melding.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kan ikke blande vedlegg som er bilder med vedlegg som ikke er bilder i samme melding.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index fcf1295a7..18f1f71cb 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -553,7 +553,7 @@ "message": "Wanneer je een bijlage insluit die geen afbeelding is, is de limiet één bijlage per bericht.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Je kunt geen combinatie van afbeeldingen en niet-afbeeldingen insluiten als bijlagen van één bericht.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/nn/messages.json b/_locales/nn/messages.json index ed41ca415..6701857fa 100644 --- a/_locales/nn/messages.json +++ b/_locales/nn/messages.json @@ -553,7 +553,7 @@ "message": "Når du inkluderer eit vedlegg som ikkje er eit bilde, er grensa eitt vedlegg per melding.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kan ikkje blanda vedlegg som er bilde med vedlegg som ikkje er bilde i same melding.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/no/messages.json b/_locales/no/messages.json index c6521e715..d0b7ec1a7 100644 --- a/_locales/no/messages.json +++ b/_locales/no/messages.json @@ -553,7 +553,7 @@ "message": "Når du inkluderer et vedlegg som ikke er et bilde, er begrensningen ett vedlegg per melding.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kan ikke blande vedlegg som er bilder med vedlegg som ikke er bilder i samme melding.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 891735619..8193a8668 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -553,7 +553,7 @@ "message": "W przypadku dołączenia załącznika innego niż obraz, limit wynosi jeden załącznik na wiadomość.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Nie można łączyć obrazów z innymi załącznikami w jednej wiadomości.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index ad32ff6bf..fa1397c7a 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -553,7 +553,7 @@ "message": "O limite para inclusão de anexos que não sejam imagens é de um por mensagem.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Você não pode combinar imagens e anexos que não sejam imagens na mesma mensagem.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json index 7901a4f77..1b23ed43d 100644 --- a/_locales/pt_PT/messages.json +++ b/_locales/pt_PT/messages.json @@ -553,7 +553,7 @@ "message": "Se o anexo não for uma imagem, apenas pode enviar um anexo por mensagem.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Não pode misturar imagens com outro tipo de anexos numa só mensagem.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index abd876712..74e70b01e 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index fe2dfc840..0c0308358 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -553,7 +553,7 @@ "message": "При включении в сообщение вложений, не относящихся к изображениям, ограничение составляет по одному вложению на сообщение.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Нельзя смешивать вложения, не относящиеся к изображениям, с изображениями в одном сообщении.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index d225b13f0..0c9621497 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "V jednej správe nemôže byť súčasne príloha s obrázkom a príloha bez obrázku.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json index 4ab526c6b..2226b1582 100644 --- a/_locales/sl/messages.json +++ b/_locales/sl/messages.json @@ -553,7 +553,7 @@ "message": "Neslikovne datoteke so omejene na eno priponko na sporočilo.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "V istem sporočilu ne morete kombinirati neslikovnih in slikovnih priponk.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json index 3c6966608..fb640dbd2 100644 --- a/_locales/sq/messages.json +++ b/_locales/sq/messages.json @@ -553,7 +553,7 @@ "message": "Kur përfshihet një bashkëngjitje që s’është figurë, kufiri është një bashkëngjitje për mesazh.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "S’mund të përzieni brenda të njëjtit mesazh bashkëngjitje figurë dhe jo figurë.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json index 0c134955a..718a3397a 100644 --- a/_locales/sr/messages.json +++ b/_locales/sr/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 915a9bb44..432c12675 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -553,7 +553,7 @@ "message": "När man inkluderar bilagor som inte är bilder, är begränsningen en bilaga per meddelande.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Du kan inte blanda bilagor som både är, och inte är, bilder i ett meddelande.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/th/messages.json b/_locales/th/messages.json index 504363ad9..3c4b6e062 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index 24786d333..5be624135 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -553,7 +553,7 @@ "message": "Görüntü olmayan eklentiler içerildiğinde, ileti başı eklenti sınırı birdir.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "Görüntü ve görüntü olmayan eklentileri tek iletide birleştiremezsiniz.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 00c23e90d..8c2af76b4 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index 5ef1b70a2..a1a35532a 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -553,7 +553,7 @@ "message": "When including a non-image attachment, the limit is one attachment per message.", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "You cannot mix non-image and image attachments in one message.", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index 9ad23fe2d..630740d86 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -553,7 +553,7 @@ "message": "每条消息只能添加一个非图片的附件。", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "在一条消息中，可以同时添加一张图片和一个非图片附件。", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index 9a675c1b3..f8d37ed4a 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -553,7 +553,7 @@ "message": "當包含的附檔不是圖片，每個訊息限制只能有一個附檔。", "description": "An error popup when the user has attempted to add an attachment" }, - "cannotMixImageAdnNonImageAttachments": { + "cannotMixImageAndNonImageAttachments": { "message": "你無法在一個訊息中，同時附上非圖片及圖片檔案。", "description": "An error popup when the user has attempted to add an attachment" }, diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js index 1aebee109..3d95bc6cc 100644 --- a/js/views/file_input_view.js +++ b/js/views/file_input_view.js @@ -215,9 +215,9 @@ showCannotMixError() { window.pushToast({ - title: i18n('cannotMixImageAdnNonImageAttachments'), + title: i18n('cannotMixImageAndNonImageAttachments'), type: 'error', - id: 'cannotMixImageAdnNonImageAttachments', + id: 'cannotMixImageAndNonImageAttachments', }); }, @@ -238,7 +238,6 @@ }, // Housekeeping - addAttachment(attachment) { if (attachment.isVoiceNote && this.attachments.length > 0) { throw new Error('A voice note cannot be sent with other attachments'); diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index cf6b9ef31..55ec5e3ba 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -1137,7 +1137,8 @@ label { background-color: $session-shade-1; padding: $session-margin-lg; - border-bottom: 2px solid $session-shade-5; + margin-bottom: 20px; + border-bottom: 1px solid $session-shade-5; &.inline { display: flex; @@ -1156,6 +1157,7 @@ label { } &__description { + font-family: "SF Pro Text"; font-size: $session-font-sm; font-weight: 100; @include session-color-subtle($session-color-white); diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index 7defcd6a9..d5b3d15ae 100644 --- a/ts/components/session/LeftPaneMessageSection.tsx +++ b/ts/components/session/LeftPaneMessageSection.tsx @@ -58,6 +58,7 @@ export class LeftPaneMessageSection extends React.Component { this.updateSearchBound = this.updateSearch.bind(this); this.handleToggleOverlay = this.handleToggleOverlay.bind(this); this.handleCloseOnboarding = this.handleCloseOnboarding.bind(this); + this.handleJoinPublicChat = this.handleJoinPublicChat.bind(this); this.handleOnPasteSessionID = this.handleOnPasteSessionID.bind(this); this.handleMessageButtonClick = this.handleMessageButtonClick.bind(this); this.debouncedSearch = debounce(this.search.bind(this), 20); @@ -240,6 +241,7 @@ export class LeftPaneMessageSection extends React.Component { text={window.i18n('joinPublicChat')} buttonType={SessionButtonType.BrandOutline} buttonColor={SessionButtonColor.Green} + onClick={this.handleJoinPublicChat} /> { }); } + public handleJoinPublicChat() { + return; + } + public updateSearch(searchTerm: string) { const { updateSearchTerm, clearSearch } = this.props;