Skip to content

Commit

Permalink
Merge branch 'clearnet' into theming
Browse files Browse the repository at this point in the history
  • Loading branch information
@yougotwill
yougotwill committed Oct 12, 2022
2 parents 557c2b8 + 74b706d commit 5b44565
Show file tree
Hide file tree
Showing 45 changed files with 429 additions and 321 deletions.
31 changes: 18 additions & 13 deletions _locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"sent": "Sent",
"received": "Received",
"sendMessage": "Message",
"groupMembers": "Group members",
"groupMembers": "Members",
"moreInformation": "More information",
"resend": "Resend",
"deleteConversationConfirmation": "Permanently delete the messages in this conversation?",
Expand All @@ -118,19 +118,19 @@
"deleteContactConfirmation": "Are you sure you want to delete this conversation?",
"quoteThumbnailAlt": "Thumbnail of image from quoted message",
"imageAttachmentAlt": "Image attached to message",
"videoAttachmentAlt": "Screenshot of video attached to message",
"videoAttachmentAlt": "Screenshot of video in message",
"lightboxImageAlt": "Image sent in conversation",
"imageCaptionIconAlt": "Icon showing that this image has a caption",
"addACaption": "Add a caption...",
"copySessionID": "Copy Session ID",
"copyOpenGroupURL": "Copy Group's URL",
"copyOpenGroupURL": "Copy Group URL",
"save": "Save",
"saveLogToDesktop": "Save log to desktop",
"saved": "Saved",
"tookAScreenshot": "$name$ took a screenshot",
"savedTheFile": "Media saved by $name$",
"linkPreviewsTitle": "Send Link Previews",
"linkPreviewDescription": "Show link previews for supported URLs.",
"linkPreviewDescription": "Generate link previews for supported URLs.",
"linkPreviewsConfirmMessage": "You will not have full metadata protection when sending link previews.",
"mediaPermissionsTitle": "Microphone",
"mediaPermissionsDescription": "Allow access to microphone.",
Expand All @@ -143,7 +143,7 @@
"typingIndicatorsSettingTitle": "Typing Indicators",
"zoomFactorSettingTitle": "Zoom Factor",
"themesSettingTitle": "Themes",
"primaryColor": "Primary Color",
"primaryColor": "Primary Colour",
"primaryColorGreen": "Primary color green",
"primaryColorBlue": "Primary color blue",
"primaryColorYellow": "Primary color yellow",
Expand All @@ -156,11 +156,11 @@
"oceanDarkThemeTitle": "Ocean Dark",
"oceanLightThemeTitle": "Ocean Light",
"pruneSettingTitle": "Trim Communities",
"pruneSettingDescription": "Delete messages from Communities older than 6 months, and where there are over 2,000 messages.",
"pruneSettingDescription": "Delete messages older than 6 months from Communities that have over 2,000 messages.",
"enable": "Enable",
"keepDisabled": "Keep disabled",
"notificationSettingsDialog": "The information shown in notifications.",
"nameAndMessage": "Name and content",
"nameAndMessage": "Name & Content",
"noNameOrMessage": "No name or content",
"nameOnly": "Name Only",
"newMessage": "New Message",
Expand Down Expand Up @@ -193,6 +193,7 @@
"timerOption_12_hours": "12 hours",
"timerOption_1_day": "1 day",
"timerOption_1_week": "1 week",
"timerOption_2_weeks": "2 weeks",
"disappearingMessages": "Disappearing messages",
"changeNickname": "Change Nickname",
"clearNickname": "Clear Nickname",
Expand All @@ -210,15 +211,16 @@
"timerOption_12_hours_abbreviated": "12h",
"timerOption_1_day_abbreviated": "1d",
"timerOption_1_week_abbreviated": "1w",
"timerOption_2_weeks_abbreviated": "2w",
"disappearingMessagesDisabled": "Disappearing messages disabled",
"disabledDisappearingMessages": "$name$ disabled disappearing messages.",
"disabledDisappearingMessages": "$name$ has turned off disappearing messages.",
"youDisabledDisappearingMessages": "You disabled disappearing messages.",
"timerSetTo": "Disappearing message time set to $time$",
"noteToSelf": "Note to Self",
"hideMenuBarTitle": "Hide Menu Bar",
"hideMenuBarDescription": "Toggle system menu bar visibility.",
"startConversation": "Start New Conversation",
"invalidNumberError": "Invalid Session ID or ONS Name",
"invalidNumberError": "Please check the Session ID or ONS name and try again",
"failedResolveOns": "Failed to resolve ONS name",
"autoUpdateSettingTitle": "Auto Update",
"autoUpdateSettingDescription": "Automatically check for updates on startup.",
Expand Down Expand Up @@ -276,11 +278,11 @@
"enterPassword": "Please enter your password",
"confirmPassword": "Confirm password",
"enterNewPassword": "Please enter your new password",
"confirmNewPassword": "Confirm password",
"confirmNewPassword": "Confirm new password",
"showRecoveryPhrasePasswordRequest": "Please enter your password",
"recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
"invalidOpenGroupUrl": "Invalid URL",
"copiedToClipboard": "Copied to clipboard",
"copiedToClipboard": "Copied",
"passwordViewTitle": "Enter Password",
"password": "Password",
"setPassword": "Set Password",
Expand Down Expand Up @@ -356,11 +358,13 @@
"appearanceSettingsTitle": "Appearance",
"privacySettingsTitle": "Privacy",
"notificationsSettingsTitle": "Notifications",
"audioNotificationsSettingsTitle": "Audio Notifications",
"notificationsSettingsContent": "Notification Content",
"notificationPreview": "Preview",
"recoveryPhraseEmpty": "Enter your recovery phrase",
"displayNameEmpty": "Please enter a display name",
"members": "$count$ members",
"activeMembers": "$count$ active members",
"join": "Join",
"joinOpenGroup": "Join Community",
"createGroup": "Create Group",
Expand All @@ -374,7 +378,7 @@
"invalidGroupNameTooLong": "Please enter a shorter group name",
"pickClosedGroupMember": "Please pick at least 1 group member",
"closedGroupMaxSize": "A group cannot have more than 100 members",
"noBlockedContacts": "No blocked contacts",
"noBlockedContacts": "You have no blocked contacts.",
"userAddedToModerators": "User added to admin list",
"userRemovedFromModerators": "User removed from admin list",
"orJoinOneOfThese": "Or join one of these...",
Expand Down Expand Up @@ -457,7 +461,7 @@
"callMissedCausePermission": "Call missed from '$name$' because you need to enable the 'Voice and video calls' permission in the Privacy Settings.",
"callMissedNotApproved": "Call missed from '$name$' as you haven't approved this conversation yet. Send a message to them first.",
"callMediaPermissionsDescription": "Enables voice and video calls to and from other users.",
"callMediaPermissionsDialogContent": "Your IP is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
"callMediaPermissionsDialogContent": "Your IP address is visible to your call partner and an Oxen Foundation server while using beta calls. Are you sure you want to enable Voice and Video Calls?",
"callMediaPermissionsDialogTitle": "Voice and Video Calls (Beta)",
"startedACall": "You called $name$",
"answeredACall": "Call with $name$",
Expand All @@ -484,6 +488,7 @@
"clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
"expandedReactionsText": "Show Less",
"reactionNotification": "Reacts to a message with $emoji$",
"rateLimitReactMessage": "Slow down! You've sent too many emoji reacts. Try again soon",
"otherSingular": "$number$ other",
"otherPlural": "$number$ others",
"reactionPopup": "reacted with",
Expand Down
Loading

0 comments on commit 5b44565

Please sign in to comment.