From b09c44c9644e77d26ceffca27e275ed080b624a5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 16 Jun 2021 11:20:31 +1000 Subject: [PATCH] remove context in locales --- _locales/ar/messages.json | 5 +-- _locales/bg/messages.json | 5 +-- _locales/ca/messages.json | 5 +-- _locales/cs/messages.json | 5 +-- _locales/da/messages.json | 5 +-- _locales/de/messages.json | 1 - _locales/el/messages.json | 5 +-- _locales/en/messages.json | 7 ++- _locales/eo/messages.json | 5 +-- _locales/es/messages.json | 1 - _locales/es_419/messages.json | 5 +-- _locales/et/messages.json | 5 +-- _locales/fa/messages.json | 5 +-- _locales/fi/messages.json | 5 +-- _locales/fil/messages.json | 5 +-- _locales/fr/messages.json | 1 - _locales/he/messages.json | 5 +-- _locales/hi/messages.json | 5 +-- _locales/hr/messages.json | 5 +-- _locales/hu/messages.json | 5 +-- _locales/id/messages.json | 3 +- _locales/it/messages.json | 1 - _locales/km/messages.json | 5 +-- _locales/kn/messages.json | 5 +-- _locales/ko/messages.json | 5 +-- _locales/lt/messages.json | 5 +-- _locales/mk/messages.json | 5 +-- _locales/nb/messages.json | 5 +-- _locales/nl/messages.json | 5 +-- _locales/no/messages.json | 5 +-- _locales/pa/messages.json | 5 +-- _locales/pl/messages.json | 1 - _locales/pt_BR/messages.json | 1 - _locales/pt_PT/messages.json | 5 +-- _locales/ro/messages.json | 5 +-- _locales/ru/messages.json | 1 - _locales/sk/messages.json | 5 +-- _locales/sl/messages.json | 5 +-- _locales/sq/messages.json | 5 +-- _locales/sr/messages.json | 5 +-- _locales/sv/messages.json | 5 +-- _locales/ta/messages.json | 5 +-- _locales/th/messages.json | 5 +-- _locales/tr/messages.json | 5 +-- _locales/uk/messages.json | 5 +-- _locales/vi/messages.json | 3 +- _locales/zh_CN/messages.json | 5 +-- _locales/zh_TW/messages.json | 5 +-- app/global_errors.js | 4 +- app/menu.js | 84 +++++++++++++++++------------------ app/spell_check.js | 14 +++--- app/sql.js | 4 +- app/tray_icon.js | 6 +-- js/modules/i18n.js | 5 +-- main.js | 10 ++--- ts/updater/common.ts | 33 +++++--------- 56 files changed, 159 insertions(+), 211 deletions(-) diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 5aafd1101..c091c9286 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "عام", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index d1a581077..1a039476d 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index 402719217..d8f72b15e 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -158,7 +158,7 @@ "permissions": "Permisos", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Permet l'accés a la càmera i el micròfon", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index f4bc3a3fb..ce1a39d79 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -158,7 +158,7 @@ "permissions": "Oprávnění", "general": "Obecné", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Umožnit přístup ke kameře a mikrofonu", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/da/messages.json b/_locales/da/messages.json index b364c45b8..e31fa3011 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -158,7 +158,7 @@ "permissions": "Tilladelser", "general": "Generelt", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Tillad adgang til kamera og mikrofon", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 3ce5f9253..39d283b65 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/el/messages.json b/_locales/el/messages.json index 5e613d986..710b92fb0 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -158,7 +158,7 @@ "permissions": "Άδειες", "general": "Γενικά", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Να επιτρέπεται η πρόσβαση στην κάμερα και μικρόφωνο", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 22ffca022..a9f3706f9 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -33,6 +33,10 @@ "viewMenuToggleDevTools": "Toggle Developer Tools", "menuSetupWithImport": "Set Up Direct Import", "contextMenuNoSuggestions": "No Suggestions", + "openGroupInvitation": "Open group invitation", + "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?", + "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you wan to join the $roomName$ open group?", + "enterSessionIDOrONSName": "Enter Session ID or ONS name", "loading": "Loading...", "optimizingApplication": "Optimizing application...", "chooseDirectory": "Choose folder", @@ -210,6 +214,8 @@ "disappearingMessages": "Disappearing messages", "changeNickname": "Change Nickname", "clearNickname": "Clear Nickname", + "nicknamePlaceholder": "New Nickname", + "changeNicknameMessage": "Enter a nickname for this user", "timerOption_0_seconds_abbreviated": "off", "timerOption_5_seconds_abbreviated": "5s", "timerOption_10_seconds_abbreviated": "10s", @@ -332,7 +338,6 @@ "addAsModerator": "Add as Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index d7a7f085e..e894b1722 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -158,7 +158,7 @@ "permissions": "Permesoj", "general": "Ĝenerala", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Permesi aliron al la fotilo kaj la mikrofono", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/es/messages.json b/_locales/es/messages.json index d9a3a1c11..2b8def64a 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json index e334fbb94..819f32252 100644 --- a/_locales/es_419/messages.json +++ b/_locales/es_419/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/et/messages.json b/_locales/et/messages.json index f5136325a..bfe168bfb 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -158,7 +158,7 @@ "permissions": "Õigused", "general": "Üldine", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Luba ligipääs kaamerale ja mikrofonile", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 9f8b6a15c..444381c9b 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -158,7 +158,7 @@ "permissions": "دسترسی ها", "general": "عمومی", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "اجازه دسترسی به دوربین و میکروفون", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index dbf060699..82c2af3da 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -158,7 +158,7 @@ "permissions": "Käyttöoikeudet", "general": "Yleistä", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Myönnä kameran ja mikrofonin käyttöoikeus", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json index e334fbb94..819f32252 100644 --- a/_locales/fil/messages.json +++ b/_locales/fil/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index ffff5b52e..7a2cc5f2e 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Ajouter Comme Modérateur", "removeFromModerators": "Supprimer Des Modérateurs", "add": "Ajouter", - "groupInvitation": "Invitation à rejoindre un groupe", "addingContacts": "Ajouter des contacts à", "noContactsToAdd": "Aucun contact à ajouter", "noMembersInThisGroup": "Aucun autre membre dans ce groupe", diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 46e5ceb21..6b3065716 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -158,7 +158,7 @@ "permissions": "הרשאות", "general": "כללי", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "התר גישה אל מצלמה ומיקרופון", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index dee7117a2..1ba5e357c 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index 45d9e677d..46bbded71 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "Općenito", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 5642a9b43..bdff3938e 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -158,7 +158,7 @@ "permissions": "Jogosultságok", "general": "Általános", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Hozzáférés a kamerához és a mikrofonhoz", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/id/messages.json b/_locales/id/messages.json index 33b6dbfd5..65de1dcc2 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -158,7 +158,7 @@ "permissions": "Perizinan", "general": "Umum", "linkPreviewsTitle": "Kirim pratinjau tautan", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Izinkan akses ke kamera dan mikrofon", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/it/messages.json b/_locales/it/messages.json index e57f13d6b..9e9f6a2cb 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/km/messages.json b/_locales/km/messages.json index 452703227..0ada91517 100644 --- a/_locales/km/messages.json +++ b/_locales/km/messages.json @@ -158,7 +158,7 @@ "permissions": "ការអនុញ្ញាត", "general": "ទូទៅ", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "បើកសិទ្ធិប្រើប្រាស់កាមេរ៉ា និងម៉ៃក្រូហ្វូន", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index e334fbb94..819f32252 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 0ae4d4667..179917fd8 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "일반 설정", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json index a6adcc00a..e1098064e 100644 --- a/_locales/lt/messages.json +++ b/_locales/lt/messages.json @@ -158,7 +158,7 @@ "permissions": "Leidimai", "general": "Bendra", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Leisti prieigą prie kameros ir mikrofono", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index 9030b55b8..04b4338bd 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "Општо", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json index e334fbb94..819f32252 100644 --- a/_locales/nb/messages.json +++ b/_locales/nb/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 9fd05be34..e412113c3 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -158,7 +158,7 @@ "permissions": "Toestemmingen", "general": "Algemeen", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Geef toestemming om de camera en microfoon te gebruiken", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/no/messages.json b/_locales/no/messages.json index e334fbb94..819f32252 100644 --- a/_locales/no/messages.json +++ b/_locales/no/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/pa/messages.json b/_locales/pa/messages.json index e334fbb94..819f32252 100644 --- a/_locales/pa/messages.json +++ b/_locales/pa/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index f7cace5c1..aa818b423 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index e86efc101..8381699aa 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json index 54e278a0d..8f335b247 100644 --- a/_locales/pt_PT/messages.json +++ b/_locales/pt_PT/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissões", "general": "Geral", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Permitir o acesso à câmara e ao microfone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index 4c590c589..7954550a0 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -158,7 +158,7 @@ "permissions": "Permisiuni", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Permite accesul la cameră și microfon", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 6dd4850dd..20f4e583f 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index 5bb2ca517..cc0b122c9 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -158,7 +158,7 @@ "permissions": "Povolenia", "general": "Všeobecné", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Povoliť prústup ku kamere a mikrofónu", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json index d4e3c8bb0..a73aefe5d 100644 --- a/_locales/sl/messages.json +++ b/_locales/sl/messages.json @@ -158,7 +158,7 @@ "permissions": "Dovoljenja", "general": "Splošno", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Dovoli dostop do kamere in mikrofona", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json index 6c3d4c19b..c1bf76f9a 100644 --- a/_locales/sq/messages.json +++ b/_locales/sq/messages.json @@ -158,7 +158,7 @@ "permissions": "Leje", "general": "Të përgjithshme", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Lejo përdorim të kamerës dhe mikrofonit", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json index e96e2b4bf..e219dd050 100644 --- a/_locales/sr/messages.json +++ b/_locales/sr/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "Опште", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 76987ff0e..40627b990 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -158,7 +158,7 @@ "permissions": "Behörigheter", "general": "Generell", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Tillåt åtkomst till kameran och mikrofonen", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json index e334fbb94..819f32252 100644 --- a/_locales/ta/messages.json +++ b/_locales/ta/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/th/messages.json b/_locales/th/messages.json index 619630aa4..d0d9c95ee 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -158,7 +158,7 @@ "permissions": "สิทธิ์", "general": "General", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "อนุญาตให้เข้าถึงกล้องและไมโครโฟน", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index 341494229..678bee9cd 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -158,7 +158,7 @@ "permissions": "İzinler", "general": "Genel", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Kamera ve mikrofona erişim izni ver", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 6cc4c9c02..789283bca 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "Загальні", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index 3113fad0b..06ff5d0ba 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -158,7 +158,7 @@ "permissions": "Permissions", "general": "Tổng quát", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "Allow access to camera and microphone", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index 0df086b37..d0144d75c 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -158,7 +158,7 @@ "permissions": "权限", "general": "通用", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "允许访问摄像头和麦克风", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index e0630f57e..c979d1e3b 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -158,7 +158,7 @@ "permissions": "許可", "general": "一般", "linkPreviewsTitle": "Send Link Previews", - "linkPreviewDescription": "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links", + "linkPreviewDescription": "Previews are supported for most urls", "linkPreviewsConfirmMessage": "You will not have full metadata protection when sending or receiving link previews.", "mediaPermissionsTitle": "Microphone and Camera", "mediaPermissionsDescription": "授權軟體可以使用相機與麥克風功能", @@ -332,7 +332,6 @@ "addAsModerator": "Add As Moderator", "removeFromModerators": "Remove From Moderators", "add": "Add", - "groupInvitation": "Group Invitation", "addingContacts": "Adding contacts to", "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", @@ -362,7 +361,7 @@ "newSession": "New Session", "searchFor...": "Search for conversations, contacts, and messages", "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter Session ID of recipient", + "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient", "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.", "message": "Message", "appearanceSettingsTitle": "Appearance", diff --git a/app/global_errors.js b/app/global_errors.js index 16d54327f..06001476a 100644 --- a/app/global_errors.js +++ b/app/global_errors.js @@ -37,8 +37,8 @@ function handleError(prefix, error) { } exports.updateLocale = messages => { - quitText = messages.quit.message; - copyErrorAndQuitText = messages.copyErrorAndQuit.message; + quitText = messages.quit; + copyErrorAndQuitText = messages.copyErrorAndQuit; }; exports.addHandler = () => { diff --git a/app/menu.js b/app/menu.js index 068b93091..c2cc340a6 100644 --- a/app/menu.js +++ b/app/menu.js @@ -18,85 +18,85 @@ exports.createTemplate = (options, messages) => { const template = [ { - label: messages.mainMenuFile.message, + label: messages.mainMenuFile, submenu: [ { type: 'separator', }, { role: 'quit', - label: messages.appMenuQuit.message, + label: messages.appMenuQuit, }, ], }, { - label: messages.mainMenuEdit.message, + label: messages.mainMenuEdit, submenu: [ { role: 'undo', - label: messages.editMenuUndo.message, + label: messages.editMenuUndo, }, { role: 'redo', - label: messages.editMenuRedo.message, + label: messages.editMenuRedo, }, { type: 'separator', }, { role: 'cut', - label: messages.editMenuCut.message, + label: messages.editMenuCut, }, { role: 'copy', - label: messages.editMenuCopy.message, + label: messages.editMenuCopy, }, { role: 'paste', - label: messages.editMenuPaste.message, + label: messages.editMenuPaste, }, { role: 'pasteandmatchstyle', - label: messages.editMenuPasteAndMatchStyle.message, + label: messages.editMenuPasteAndMatchStyle, }, { role: 'delete', - label: messages.editMenuDelete.message, + label: messages.editMenuDelete, }, { role: 'selectall', - label: messages.editMenuSelectAll.message, + label: messages.editMenuSelectAll, }, ], }, { - label: messages.mainMenuView.message, + label: messages.mainMenuView, submenu: [ { role: 'resetzoom', - label: messages.viewMenuResetZoom.message, + label: messages.viewMenuResetZoom, }, { accelerator: platform === 'darwin' ? 'Command+=' : 'Control+Plus', role: 'zoomin', - label: messages.viewMenuZoomIn.message, + label: messages.viewMenuZoomIn, }, { role: 'zoomout', - label: messages.viewMenuZoomOut.message, + label: messages.viewMenuZoomOut, }, { type: 'separator', }, { role: 'togglefullscreen', - label: messages.viewMenuToggleFullScreen.message, + label: messages.viewMenuToggleFullScreen, }, { type: 'separator', }, { - label: messages.debugLog.message, + label: messages.debugLog, click: showDebugLog, }, { @@ -104,44 +104,44 @@ exports.createTemplate = (options, messages) => { }, { role: 'toggledevtools', - label: messages.viewMenuToggleDevTools.message, + label: messages.viewMenuToggleDevTools, }, ], }, { - label: messages.mainMenuWindow.message, + label: messages.mainMenuWindow, role: 'window', submenu: [ { role: 'minimize', - label: messages.windowMenuMinimize.message, + label: messages.windowMenuMinimize, }, ], }, { - label: messages.mainMenuHelp.message, + label: messages.mainMenuHelp, role: 'help', submenu: [ { - label: messages.goToReleaseNotes.message, + label: messages.goToReleaseNotes, click: openReleaseNotes, }, { type: 'separator', }, { - label: messages.goToSupportPage.message, + label: messages.goToSupportPage, click: openSupportPage, }, { - label: messages.menuReportIssue.message, + label: messages.menuReportIssue, click: openNewBugForm, }, { type: 'separator', }, { - label: messages.about.message, + label: messages.about, click: showAbout, }, ], @@ -157,7 +157,7 @@ exports.createTemplate = (options, messages) => { type: 'separator', }); fileMenu.submenu.unshift({ - label: messages.menuSetupWithImport.message, + label: messages.menuSetupWithImport, click: setupWithImport, }); } @@ -183,10 +183,10 @@ function updateForMac(template, messages, options) { // Add a File menu just for these setup options. Because we're using unshift(), we add // the file menu first, though it ends up to the right of the Signal Desktop menu. const fileMenu = { - label: messages.mainMenuFile.message, + label: messages.mainMenuFile, submenu: [ { - label: messages.menuSetupWithImport.message, + label: messages.menuSetupWithImport, click: setupWithImport, }, ], @@ -197,10 +197,10 @@ function updateForMac(template, messages, options) { // Add the OSX-specific Signal Desktop menu at the far left template.unshift({ - label: messages.sessionMessenger.message, + label: messages.sessionMessenger, submenu: [ { - label: messages.about.message, + label: messages.about, click: showAbout, }, { @@ -210,22 +210,22 @@ function updateForMac(template, messages, options) { type: 'separator', }, { - label: messages.appMenuHide.message, + label: messages.appMenuHide, role: 'hide', }, { - label: messages.appMenuHideOthers.message, + label: messages.appMenuHideOthers, role: 'hideothers', }, { - label: messages.appMenuUnhide.message, + label: messages.appMenuUnhide, role: 'unhide', }, { type: 'separator', }, { - label: messages.appMenuQuit.message, + label: messages.appMenuQuit, role: 'quit', }, ], @@ -238,15 +238,15 @@ function updateForMac(template, messages, options) { type: 'separator', }, { - label: messages.speech.message, + label: messages.speech, submenu: [ { role: 'startspeaking', - label: messages.editMenuStartSpeaking.message, + label: messages.editMenuStartSpeaking, }, { role: 'stopspeaking', - label: messages.editMenuStopSpeaking.message, + label: messages.editMenuStopSpeaking, }, ], } @@ -257,21 +257,21 @@ function updateForMac(template, messages, options) { // eslint-disable-next-line no-param-reassign template[windowMenuTemplateIndex].submenu = [ { - label: messages.windowMenuClose.message, + label: messages.windowMenuClose, accelerator: 'CmdOrCtrl+W', role: 'close', }, { - label: messages.windowMenuMinimize.message, + label: messages.windowMenuMinimize, accelerator: 'CmdOrCtrl+M', role: 'minimize', }, { - label: messages.windowMenuZoom.message, + label: messages.windowMenuZoom, role: 'zoom', }, { - label: messages.show.message, + label: messages.show, click: showWindow, }, { @@ -279,7 +279,7 @@ function updateForMac(template, messages, options) { }, { role: 'front', - label: messages.windowMenuBringAllToFront.message, + label: messages.windowMenuBringAllToFront, }, ]; diff --git a/app/spell_check.js b/app/spell_check.js index 695c171a6..7dd49890a 100644 --- a/app/spell_check.js +++ b/app/spell_check.js @@ -37,7 +37,7 @@ exports.setup = (browserWindow, messages) => { ); } else { template.push({ - label: messages.contextMenuNoSuggestions.message, + label: messages.contextMenuNoSuggestions, enabled: false, }); } @@ -46,28 +46,28 @@ exports.setup = (browserWindow, messages) => { if (params.isEditable) { if (editFlags.canUndo) { - template.push({ label: messages.editMenuUndo.message, role: 'undo' }); + template.push({ label: messages.editMenuUndo, role: 'undo' }); } // This is only ever `true` if undo was triggered via the context menu // (not ctrl/cmd+z) if (editFlags.canRedo) { - template.push({ label: messages.editMenuRedo.message, role: 'redo' }); + template.push({ label: messages.editMenuRedo, role: 'redo' }); } if (editFlags.canUndo || editFlags.canRedo) { template.push({ type: 'separator' }); } if (editFlags.canCut) { - template.push({ label: messages.editMenuCut.message, role: 'cut' }); + template.push({ label: messages.editMenuCut, role: 'cut' }); } } if (editFlags.canPaste) { - template.push({ label: messages.editMenuPaste.message, role: 'paste' }); + template.push({ label: messages.editMenuPaste, role: 'paste' }); } if (editFlags.canPaste) { template.push({ - label: messages.editMenuPasteAndMatchStyle.message, + label: messages.editMenuPasteAndMatchStyle, role: 'pasteAndMatchStyle', }); } @@ -76,7 +76,7 @@ exports.setup = (browserWindow, messages) => { // results in all the UI being selected if (editFlags.canSelectAll && params.isEditable) { template.push({ - label: messages.editMenuSelectAll.message, + label: messages.editMenuSelectAll, role: 'selectall', }); } diff --git a/app/sql.js b/app/sql.js index 01a187724..1afe8a5b1 100644 --- a/app/sql.js +++ b/app/sql.js @@ -1276,10 +1276,10 @@ async function initialize({ configDir, key, messages, passwordAttempt }) { } console.log('Database startup error:', error.stack); const buttonIndex = dialog.showMessageBox({ - buttons: [messages.copyErrorAndQuit.message, messages.clearAllData.message], + buttons: [messages.copyErrorAndQuit, messages.clearAllData], defaultId: 0, detail: redactAll(error.stack), - message: messages.databaseError.message, + message: messages.databaseError, noLink: true, type: 'error', }); diff --git a/app/tray_icon.js b/app/tray_icon.js index 66489e6fd..fa842a9aa 100644 --- a/app/tray_icon.js +++ b/app/tray_icon.js @@ -66,12 +66,12 @@ function createTrayIcon(getMainWindow, messages) { trayContextMenu = Menu.buildFromTemplate([ { id: 'toggleWindowVisibility', - label: messages[mainWindow.isVisible() ? 'appMenuHide' : 'show'].message, + label: messages[mainWindow.isVisible() ? 'appMenuHide' : 'show'], click: tray.toggleWindowVisibility, }, { id: 'quit', - label: messages.appMenuQuit.message, + label: messages.appMenuQuit, click: app.quit.bind(app), }, ]); @@ -98,7 +98,7 @@ function createTrayIcon(getMainWindow, messages) { tray.on('click', tray.showWindow); - tray.setToolTip(messages.sessionMessenger.message); + tray.setToolTip(messages.sessionMessenger); tray.updateContextMenu(); return tray; diff --git a/js/modules/i18n.js b/js/modules/i18n.js index d507c177b..9cd8ef2d3 100644 --- a/js/modules/i18n.js +++ b/js/modules/i18n.js @@ -10,13 +10,12 @@ exports.setup = (locale, messages) => { } function getMessage(key, substitutions) { - const entry = messages[key]; - if (!entry) { + const message = messages[key]; + if (!message) { log.error(`i18n: Attempted to get translation for nonexistent key '${key}'`); return ''; } - const { message } = entry; if (Array.isArray(substitutions)) { return substitutions.reduce( (result, substitution) => result.replace(/\$.+?\$/, substitution), diff --git a/main.js b/main.js index 7b8f87b72..d0c9cf02d 100644 --- a/main.js +++ b/main.js @@ -550,7 +550,7 @@ function showAbout() { width: 500, height: 400, resizable: false, - title: locale.messages.about.message, + title: locale.messages.about, autoHideMenuBar: true, backgroundColor: '#2090EA', show: false, @@ -592,7 +592,7 @@ async function showDebugLogWindow() { width: Math.max(size[0] - 100, WINDOW_SIZE.minWidth), height: Math.max(size[1] - 100, WINDOW_SIZE.minHeight), resizable: false, - title: locale.messages.debugLog.message, + title: locale.messages.debugLog, autoHideMenuBar: true, backgroundColor: '#FFFFFF', show: false, @@ -909,7 +909,7 @@ ipc.on('password-window-login', async (event, passPhrase) => { await showMainWindow(passPhrase, passwordAttempt); sendResponse(); } catch (e) { - const localisedError = locale.messages.invalidPassword.message; + const localisedError = locale.messages.invalidPassword; sendResponse(localisedError || 'Invalid password'); } }); @@ -922,7 +922,7 @@ ipc.on('set-password', async (event, passPhrase, oldPhrase) => { const hash = await sql.getPasswordHash(); const hashMatches = oldPhrase && passwordUtil.matchesHash(oldPhrase, hash); if (hash && !hashMatches) { - const incorrectOldPassword = locale.messages.invalidOldPassword.message; + const incorrectOldPassword = locale.messages.invalidOldPassword; sendResponse( incorrectOldPassword || 'Failed to set password: Old password provided is invalid' ); @@ -943,7 +943,7 @@ ipc.on('set-password', async (event, passPhrase, oldPhrase) => { sendResponse(); } catch (e) { - const localisedError = locale.messages.setPasswordFail.message; + const localisedError = locale.messages.setPasswordFail; sendResponse(localisedError || 'Failed to set password'); } }); diff --git a/ts/updater/common.ts b/ts/updater/common.ts index 6aa68f9bb..1c7e41246 100644 --- a/ts/updater/common.ts +++ b/ts/updater/common.ts @@ -1,10 +1,7 @@ import { BrowserWindow, dialog } from 'electron'; export type MessagesType = { - [key: string]: { - message: string; - description?: string; - }; + [key: string]: string; }; type LogFunction = (...args: Array) => void; @@ -26,13 +23,10 @@ export async function showDownloadUpdateDialog( const LATER_BUTTON = 1; const options = { type: 'info', - buttons: [ - messages.autoUpdateDownloadButtonLabel.message, - messages.autoUpdateLaterButtonLabel.message, - ], - title: messages.autoUpdateNewVersionTitle.message, - message: messages.autoUpdateNewVersionMessage.message, - detail: messages.autoUpdateDownloadInstructions.message, + buttons: [messages.autoUpdateDownloadButtonLabel, messages.autoUpdateLaterButtonLabel], + title: messages.autoUpdateNewVersionTitle, + message: messages.autoUpdateNewVersionMessage, + detail: messages.autoUpdateDownloadInstructions, defaultId: LATER_BUTTON, cancelId: DOWNLOAD_BUTTON, }; @@ -50,13 +44,10 @@ export async function showUpdateDialog( const LATER_BUTTON = 1; const options = { type: 'info', - buttons: [ - messages.autoUpdateRestartButtonLabel.message, - messages.autoUpdateLaterButtonLabel.message, - ], - title: messages.autoUpdateNewVersionTitle.message, - message: messages.autoUpdateDownloadedMessage.message, - detail: messages.autoUpdateNewVersionInstructions.message, + buttons: [messages.autoUpdateRestartButtonLabel, messages.autoUpdateLaterButtonLabel], + title: messages.autoUpdateNewVersionTitle, + message: messages.autoUpdateDownloadedMessage, + detail: messages.autoUpdateNewVersionInstructions, defaultId: LATER_BUTTON, cancelId: RESTART_BUTTON, }; @@ -68,9 +59,9 @@ export async function showUpdateDialog( export async function showCannotUpdateDialog(mainWindow: BrowserWindow, messages: MessagesType) { const options = { type: 'error', - buttons: [messages.ok.message], - title: messages.cannotUpdate.message, - message: messages.cannotUpdateDetail.message, + buttons: [messages.ok], + title: messages.cannotUpdate, + message: messages.cannotUpdateDetail, }; await dialog.showMessageBox(mainWindow, options); }