Merge remote-tracking branch 'upstream/unstable' into closed-group-ch…

…unk1

CONTRIBUTING.md

@@ -41,6 +41,12 @@ Building on Windows is a pain, but is possible see our CI/Windows build machine
 1.  Install build tools `apt install build-essential cmake` (this installs make, g++, gcc)
 2.  Depending on your distro, you might need to install `hunspell` and `hunspell-<lan>` (e.g. `hunspell-en-au`)
 
+In Ubuntu, you may also need to install
+```
+sudo apt install cmake
+npm install cmake-js
+```
+
 ### All platforms
 
 Now, run these commands in your preferred terminal in a good directory for development:

_locales/ar/messages.json

@@ -31,7 +31,7 @@
   "openGroupInvitation": "دعوة المجتمع",
   "joinOpenGroupAfterInvitationConfirmationTitle": "انضَم إلى $roomName$؟",
   "joinOpenGroupAfterInvitationConfirmationDesc": "هل أنت متحقِّق أنك تريد الانضمام إلى المجموعة المفتوحة $roomName$؟",
-  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
+  "couldntFindServerMatching": "تعذر العثور على خادم المجتمع المقابل",
   "enterSessionIDOrONSName": "أدخل عنوان التعريف أو اسم ONS",
   "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
   "loading": "جاري التحميل",
@@ -45,6 +45,7 @@
   "incomingError": "خطأ في معالجة الرسالة الواردة",
   "media": "الوسائط",
   "mediaEmptyState": "You don’t have any media in this conversation",
+  "document": "Document",
   "documents": "وثائق",
   "documentsEmptyState": "You don’t have any documents in this conversation",
   "today": "اليوم",
@@ -70,9 +71,10 @@
   "show": "اظهر",
   "sessionMessenger": "جلسة محادثة",
   "noSearchResults": "No results for \"$searchTerm$\"",
-  "conversationsHeader": "جهات الاتصال و المجموعات",
+  "conversationsHeader": "Contacts and Groups: $count$",
   "contactsHeader": "جهات الإتصال",
   "messagesHeader": "Conversations",
+  "searchMessagesHeader": "Messages: $count$",
   "settingsHeader": "التعديلات",
   "typingAlt": "مؤثرات الكتابة لهذه المحادثة",
   "contactAvatarAlt": "صورة المتصل $name$",
@@ -83,6 +85,7 @@
   "you": "انت",
   "audioPermissionNeededTitle": "Microphone access required",
   "audioPermissionNeeded": "To send audio messages, allow Session Desktop to access your microphone.",
+  "image": "Image",
   "audio": "صوت",
   "video": "فيديو",
   "photo": "صورة",
@@ -178,7 +181,6 @@
   "messageBodyMissing": "اكتب نص الرسالة من فضلك.",
   "messageBody": "Message body",
   "unblockToSend": "فك حظر هذه جهة الإتصال لإرسال رسالة",
-  "unblockGroupToSend": "Unblock this group to send a message.",
   "youChangedTheTimer": "لقد عينت وقت اختفاء الرسالة اِلى $time$",
   "timerSetOnSync": "تم تحديث وقت اختفاء الرسالة الى $time$",
   "theyChangedTheTimer": "$name$ حدد وقت اختفاء الرسالة الى $time$",
@@ -440,6 +442,8 @@
   "clearAll": "Clear All",
   "clearDataSettingsTitle": "Clear Data",
   "messageRequests": "طلبات المُراسلة",
+  "blindedMsgReqsSettingTitle": "Community Message Requests",
+  "blindedMsgReqsSettingDesc": "Allow message requests from Community conversations.",
   "requestsSubtitle": "الطلبات المعلقة",
   "requestsPlaceholder": "لا توجد طلبات",
   "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
@@ -487,6 +491,7 @@
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
   "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
@@ -504,5 +509,6 @@
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
   "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
+  "setDisplayPicture": "Set Display Picture"
 }

_locales/be/messages.json

@@ -1,57 +1,58 @@
 {
-  "copyErrorAndQuit": "Copy error and quit",
-  "unknown": "Unknown",
-  "databaseError": "Database Error",
-  "mainMenuFile": "&File",
-  "mainMenuEdit": "&Edit",
-  "mainMenuView": "&View",
-  "mainMenuWindow": "&Window",
-  "mainMenuHelp": "&Help",
-  "appMenuHide": "Hide",
-  "appMenuHideOthers": "Hide Others",
-  "appMenuUnhide": "Show All",
-  "appMenuQuit": "Quit Session",
-  "editMenuUndo": "Undo",
-  "editMenuRedo": "Redo",
-  "editMenuCut": "Cut",
-  "editMenuCopy": "Copy",
-  "editMenuPaste": "Paste",
-  "editMenuDeleteContact": "Delete Contact",
-  "editMenuDeleteGroup": "Delete Group",
-  "editMenuSelectAll": "Select all",
-  "windowMenuClose": "Close Window",
-  "windowMenuMinimize": "Minimize",
-  "windowMenuZoom": "Zoom",
-  "viewMenuResetZoom": "Actual Size",
-  "viewMenuZoomIn": "Zoom In",
-  "viewMenuZoomOut": "Zoom Out",
-  "viewMenuToggleFullScreen": "Toggle Full Screen",
-  "viewMenuToggleDevTools": "Toggle Developer Tools",
-  "contextMenuNoSuggestions": "No Suggestions",
-  "openGroupInvitation": "Community invitation",
-  "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?",
-  "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
-  "couldntFindServerMatching": "Couldn't find the corresponding Community server",
-  "enterSessionIDOrONSName": "Enter Session ID or ONS name",
-  "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
-  "loading": "Loading...",
-  "done": "Done",
-  "youLeftTheGroup": "You have left the group.",
-  "youGotKickedFromGroup": "You were removed from the group.",
-  "unreadMessages": "Unread Messages",
-  "debugLogExplanation": "This log will be saved to your desktop.",
-  "reportIssue": "Report a Bug",
-  "markAllAsRead": "Mark All as Read",
-  "incomingError": "Error handling incoming message",
-  "media": "Media",
-  "mediaEmptyState": "No media",
-  "documents": "Documents",
-  "documentsEmptyState": "No documents",
-  "today": "Today",
-  "yesterday": "Yesterday",
-  "thisWeek": "This week",
-  "thisMonth": "This Month",
-  "voiceMessage": "Voice Message",
+  "copyErrorAndQuit": "Скапіяваць памылку і выйсці",
+  "unknown": "Невядомы",
+  "databaseError": "Памылка базы дадзеных",
+  "mainMenuFile": "&Файл",
+  "mainMenuEdit": "&Рэдагаваць",
+  "mainMenuView": "&Выгляд",
+  "mainMenuWindow": "&Акно",
+  "mainMenuHelp": "&Дапамога",
+  "appMenuHide": "Схаваць",
+  "appMenuHideOthers": "Схаваць іншыя",
+  "appMenuUnhide": "Паказаць усё",
+  "appMenuQuit": "Пакінуць Session",
+  "editMenuUndo": "Скасаваць",
+  "editMenuRedo": "Паўтарыць",
+  "editMenuCut": "Выразаць",
+  "editMenuCopy": "Скапіяваць",
+  "editMenuPaste": "Уставіць",
+  "editMenuDeleteContact": "Выдаліць кантакт",
+  "editMenuDeleteGroup": "Выдаліць групу",
+  "editMenuSelectAll": "Абраць усё",
+  "windowMenuClose": "Закрыць акно",
+  "windowMenuMinimize": "Згарнуць",
+  "windowMenuZoom": "Маштаб",
+  "viewMenuResetZoom": "Зыходны памер",
+  "viewMenuZoomIn": "Павялічыць",
+  "viewMenuZoomOut": "Паменшыць",
+  "viewMenuToggleFullScreen": "Пераключыцца ў поўнаэкранны рэжым",
+  "viewMenuToggleDevTools": "Пераключыць інструменты распрацоўшчыка",
+  "contextMenuNoSuggestions": "Няма прапаноў",
+  "openGroupInvitation": "Запрашэньне ў суполку",
+  "joinOpenGroupAfterInvitationConfirmationTitle": "Далучыцца да $roomName$?",
+  "joinOpenGroupAfterInvitationConfirmationDesc": "Вы ўпэўненыя, што хочаце далучыцца да суполкі $roomName$?",
+  "couldntFindServerMatching": "Не ўдалося знайсці адпаведны сервер супольнасці",
+  "enterSessionIDOrONSName": "Увядзіце Session ID або імя ONS",
+  "startNewConversationBy...": "Пачaць новую размову, увёўшы чыйсьці Session ID, або падзяліўшыся вашым Session ID.",
+  "loading": "Загрузка...",
+  "done": "Гатова",
+  "youLeftTheGroup": "Вы пакінулі суполку.",
+  "youGotKickedFromGroup": "Вас выдалілі з суполкі.",
+  "unreadMessages": "Непрачытаных паведамленняў",
+  "debugLogExplanation": "Дадзены лог будзе захаваны на працоўным стале.",
+  "reportIssue": "Паведаміць аб памылцы",
+  "markAllAsRead": "Прачытаць усё",
+  "incomingError": "Памылка апрацоўкі ўваходнага паведамлення",
+  "media": "Медыя",
+  "mediaEmptyState": "Няма медыя",
+  "document": "Document",
+  "documents": "Дакументы",
+  "documentsEmptyState": "Няма дакументаў",
+  "today": "Сёньня",
+  "yesterday": "Учора",
+  "thisWeek": "На гэтым тыдні",
+  "thisMonth": "У гэтым месяцы",
+  "voiceMessage": "Галасавое паведамленьне",
   "stagedPreviewThumbnail": "Draft thumbnail link preview for $domain$",
   "previewThumbnail": "Thumbnail link preview for $domain$",
   "stagedImageAttachment": "Draft image attachment: $path$",
@@ -60,49 +61,51 @@
   "maximumAttachments": "Maximum number of attachments reached. Please send remaining attachments in a separate message.",
   "fileSizeWarning": "Attachment exceeds size limits for the type of message you're sending.",
   "unableToLoadAttachment": "Sorry, there was an error setting your attachment.",
-  "offline": "Offline",
-  "debugLog": "Debug Log",
-  "showDebugLog": "Export Logs",
+  "offline": "Офлайн",
+  "debugLog": "Логі адладкі",
+  "showDebugLog": "Экспартаваць логі",
   "shareBugDetails": "Export your logs, then upload the file though Session's Help Desk.",
   "goToReleaseNotes": "Go to Release Notes",
   "goToSupportPage": "Go to Support Page",
-  "about": "About",
-  "show": "Show",
+  "about": "Аб праграме",
+  "show": "Паказаць",
   "sessionMessenger": "Session",
   "noSearchResults": "No results found for \"$searchTerm$\"",
-  "conversationsHeader": "Contacts and Groups",
-  "contactsHeader": "Contacts",
-  "messagesHeader": "Conversations",
-  "settingsHeader": "Settings",
+  "conversationsHeader": "Contacts and Groups: $count$",
+  "contactsHeader": "Кантакты",
+  "messagesHeader": "Размовы",
+  "searchMessagesHeader": "Messages: $count$",
+  "settingsHeader": "Налады",
   "typingAlt": "Typing animation for this conversation",
   "contactAvatarAlt": "Avatar for contact $name$",
   "downloadAttachment": "Download Attachment",
   "replyToMessage": "Reply to message",
   "replyingToMessage": "Replying to:",
   "originalMessageNotFound": "Original message not found",
-  "you": "You",
+  "you": "Вы",
   "audioPermissionNeededTitle": "Microphone Access Required",
   "audioPermissionNeeded": "You can enable microphone access under: Settings (Gear icon) => Privacy",
-  "audio": "Audio",
-  "video": "Video",
-  "photo": "Photo",
+  "image": "Image",
+  "audio": "Аўдыё",
+  "video": "Відэа",
+  "photo": "Фотаздымак",
   "cannotUpdate": "Cannot Update",
   "cannotUpdateDetail": "Session Desktop failed to update, but there is a new version available. Please go to https://getsession.org/ and install the new version manually, then either contact support or file a bug about this problem.",
   "ok": "OK",
-  "cancel": "Cancel",
-  "close": "Close",
-  "continue": "Continue",
-  "error": "Error",
-  "delete": "Delete",
+  "cancel": "Скасаваць",
+  "close": "Закрыць",
+  "continue": "Працягнуць",
+  "error": "Памылка",
+  "delete": "Выдаліць",
   "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
-  "deleteJustForMe": "Delete just for me",
-  "deleteForEveryone": "Delete for everyone",
+  "deleteJustForMe": "Выдаліць толькі для мяне",
+  "deleteForEveryone": "Выдаліць для ўсіх",
   "deleteMessagesQuestion": "Delete $count$ messages?",
-  "deleteMessageQuestion": "Delete this message?",
-  "deleteMessages": "Delete Messages",
-  "deleteConversation": "Delete Conversation",
+  "deleteMessageQuestion": "Выдаліць гэтае паведамленьне?",
+  "deleteMessages": "Выдаліць паведамленьні",
+  "deleteConversation": "Выдаліць размову",
   "deleted": "$count$ deleted",
-  "messageDeletedPlaceholder": "This message has been deleted",
+  "messageDeletedPlaceholder": "Гэта паведамленне было выдалена",
   "from": "From:",
   "to": "To:",
   "sent": "Sent",
@@ -127,7 +130,7 @@
   "copyOpenGroupURL": "Copy Group URL",
   "save": "Save",
   "saveLogToDesktop": "Save log to desktop",
-  "saved": "Saved",
+  "saved": "Захавана",
   "tookAScreenshot": "$name$ took a screenshot",
   "savedTheFile": "Media saved by $name$",
   "linkPreviewsTitle": "Send Link Previews",
@@ -178,7 +181,6 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Unblock this contact to send a message.",
-  "unblockGroupToSend": "This group is blocked. Unlock it if you would like to send a message.",
   "youChangedTheTimer": "You set the disappearing message timer to $time$",
   "timerSetOnSync": "Updated disappearing message timer to $time$",
   "theyChangedTheTimer": "$name$ set the disappearing message timer to $time$",
@@ -440,6 +442,8 @@
   "clearAll": "Clear All",
   "clearDataSettingsTitle": "Clear Data",
   "messageRequests": "Message Requests",
+  "blindedMsgReqsSettingTitle": "Community Message Requests",
+  "blindedMsgReqsSettingDesc": "Allow message requests from Community conversations.",
   "requestsSubtitle": "Pending Requests",
   "requestsPlaceholder": "No requests",
   "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
@@ -487,6 +491,7 @@
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
   "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
@@ -504,5 +509,6 @@
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
   "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
+  "setDisplayPicture": "Set Display Picture"
 }

_locales/bg/messages.json

@@ -45,6 +45,7 @@
   "incomingError": "Ошибка при обработке входящего сообщения",
   "media": "Медиа",
   "mediaEmptyState": "Нет медиа-файлов",
+  "document": "Document",
   "documents": "Документы",
   "documentsEmptyState": "Нет документов",
   "today": "Сегодня",
@@ -70,9 +71,10 @@
   "show": "Показать",
   "sessionMessenger": "Сесия",
   "noSearchResults": "Результаты не найдены для \"$searchTerm$\"",
-  "conversationsHeader": "Контакти и Групи",
+  "conversationsHeader": "Contacts and Groups: $count$",
   "contactsHeader": "Контакты",
   "messagesHeader": "Conversations",
+  "searchMessagesHeader": "Messages: $count$",
   "settingsHeader": "Настройки",
   "typingAlt": "Анимация набора текста для этого разговора",
   "contactAvatarAlt": "Аватар для контакта $name$",
@@ -83,6 +85,7 @@
   "you": "Вы",
   "audioPermissionNeededTitle": "Microphone access required",
   "audioPermissionNeeded": "Для отправки аудиосообщений разрешите Session доступ к микрофону.",
+  "image": "Image",
   "audio": "Аудио",
   "video": "Видео",
   "photo": "Фото",
@@ -178,7 +181,6 @@
   "messageBodyMissing": "Please enter a message body.",
   "messageBody": "Message body",
   "unblockToSend": "Разблокируйте этот контакт, чтобы отправить сообщение.",
-  "unblockGroupToSend": "Чтобы послать сообщение, сначала разблокируйте эту группу",
   "youChangedTheTimer": "Вы установили таймер для исчезающих сообщений на $time$.",
   "timerSetOnSync": "Обновлен таймер исчезновения сообщений до $time$",
   "theyChangedTheTimer": "$name$ установил(а) таймер для исчезающих сообщений на $time$.",
@@ -440,6 +442,8 @@
   "clearAll": "Clear All",
   "clearDataSettingsTitle": "Clear Data",
   "messageRequests": "Message Requests",
+  "blindedMsgReqsSettingTitle": "Community Message Requests",
+  "blindedMsgReqsSettingDesc": "Allow message requests from Community conversations.",
   "requestsSubtitle": "Pending Requests",
   "requestsPlaceholder": "No requests",
   "hideRequestBannerDescription": "Hide the Message Request banner until you receive a new message request.",
@@ -487,6 +491,7 @@
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
   "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
@@ -504,5 +509,6 @@
   "reactionPopupThree": "$name$, $name2$ & $name3$",
   "reactionPopupMany": "$name$, $name2$, $name3$ &",
   "reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
-  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
+  "reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
+  "setDisplayPicture": "Set Display Picture"
 }