Merge branch 'develop' into johannes/find-myself
This commit is contained in:
Johannes Marbach
GitHub
commit
d0e9331f07
612 changed files with 3608 additions and 2769 deletions
|
|
@ -458,7 +458,7 @@
|
|||
"Verifies a user, session, and pubkey tuple": "Verifies a user, session, and pubkey tuple",
|
||||
"Unknown (user, session) pair: (%(userId)s, %(deviceId)s)": "Unknown (user, session) pair: (%(userId)s, %(deviceId)s)",
|
||||
"Session already verified!": "Session already verified!",
|
||||
"WARNING: Session already verified, but keys do NOT MATCH!": "WARNING: Session already verified, but keys do NOT MATCH!",
|
||||
"WARNING: session already verified, but keys do NOT MATCH!": "WARNING: session already verified, but keys do NOT MATCH!",
|
||||
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
|
||||
"Verified key": "Verified key",
|
||||
"The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.",
|
||||
|
|
@ -1457,7 +1457,7 @@
|
|||
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
|
||||
"Unable to load key backup status": "Unable to load key backup status",
|
||||
"Restore from Backup": "Restore from Backup",
|
||||
"This session is backing up your keys. ": "This session is backing up your keys. ",
|
||||
"This session is backing up your keys.": "This session is backing up your keys.",
|
||||
"This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
|
||||
"Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.",
|
||||
"Connect this session to Key Backup": "Connect this session to Key Backup",
|
||||
|
|
@ -1606,7 +1606,7 @@
|
|||
"Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.",
|
||||
"Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.",
|
||||
"Personal ban list": "Personal ban list",
|
||||
"Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.",
|
||||
"Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named '%(myBanList)s' - stay in this room to keep the ban list in effect.": "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named '%(myBanList)s' - stay in this room to keep the ban list in effect.",
|
||||
"Server or user ID to ignore": "Server or user ID to ignore",
|
||||
"eg: @bot:* or example.org": "eg: @bot:* or example.org",
|
||||
"Ignore": "Ignore",
|
||||
|
|
@ -1673,7 +1673,7 @@
|
|||
"Voice processing": "Voice processing",
|
||||
"Connection": "Connection",
|
||||
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
|
||||
"<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
|
||||
"<b>Warning</b>: upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
|
||||
"Upgrade this space to the recommended room version": "Upgrade this space to the recommended room version",
|
||||
"Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
|
||||
"View older version of %(spaceName)s.": "View older version of %(spaceName)s.",
|
||||
|
|
@ -2319,6 +2319,8 @@
|
|||
"%(displayName)s cancelled verification.": "%(displayName)s cancelled verification.",
|
||||
"You cancelled verification.": "You cancelled verification.",
|
||||
"Verification cancelled": "Verification cancelled",
|
||||
"%(count)s votes|other": "%(count)s votes",
|
||||
"%(count)s votes|one": "%(count)s vote",
|
||||
"%(name)s started a video call": "%(name)s started a video call",
|
||||
"Video call ended": "Video call ended",
|
||||
"Sunday": "Sunday",
|
||||
|
|
@ -2400,8 +2402,7 @@
|
|||
"You cancelled": "You cancelled",
|
||||
"%(name)s declined": "%(name)s declined",
|
||||
"%(name)s cancelled": "%(name)s cancelled",
|
||||
"Accepting …": "Accepting …",
|
||||
"Declining …": "Declining …",
|
||||
"Declining…": "Declining…",
|
||||
"%(name)s wants to verify": "%(name)s wants to verify",
|
||||
"You sent a verification request": "You sent a verification request",
|
||||
"Expand map": "Expand map",
|
||||
|
|
@ -2421,8 +2422,6 @@
|
|||
"Based on %(count)s votes|other": "Based on %(count)s votes",
|
||||
"Based on %(count)s votes|one": "Based on %(count)s vote",
|
||||
"edited": "edited",
|
||||
"%(count)s votes|other": "%(count)s votes",
|
||||
"%(count)s votes|one": "%(count)s vote",
|
||||
"Error decrypting video": "Error decrypting video",
|
||||
"Error processing voice message": "Error processing voice message",
|
||||
"Add reaction": "Add reaction",
|
||||
|
|
@ -2849,7 +2848,7 @@
|
|||
"Waiting for partner to confirm...": "Waiting for partner to confirm...",
|
||||
"Incoming Verification Request": "Incoming Verification Request",
|
||||
"Integrations are disabled": "Integrations are disabled",
|
||||
"Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
|
||||
"Enable '%(manageIntegrations)s' in Settings to do this.": "Enable '%(manageIntegrations)s' in Settings to do this.",
|
||||
"Integrations not allowed": "Integrations not allowed",
|
||||
"Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.": "Your %(brand)s doesn't allow you to use an integration manager to do this. Please contact an admin.",
|
||||
"To continue, use Single Sign On to prove your identity.": "To continue, use Single Sign On to prove your identity.",
|
||||
|
|
@ -3142,10 +3141,10 @@
|
|||
"Enter Security Key": "Enter Security Key",
|
||||
"This looks like a valid Security Key!": "This looks like a valid Security Key!",
|
||||
"Not a valid Security Key": "Not a valid Security Key",
|
||||
"<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
|
||||
"Access your secure message history and set up secure messaging by entering your Security Key.": "Access your secure message history and set up secure messaging by entering your Security Key.",
|
||||
"If you've forgotten your Security Key you can <button>set up new recovery options</button>": "If you've forgotten your Security Key you can <button>set up new recovery options</button>",
|
||||
"There are no polls in this room": "There are no polls in this room",
|
||||
"There are no active polls in this room": "There are no active polls in this room",
|
||||
"There are no past polls in this room": "There are no past polls in this room",
|
||||
"Send custom account data event": "Send custom account data event",
|
||||
"Send custom room account data event": "Send custom room account data event",
|
||||
"Event Type": "Event Type",
|
||||
|
|
@ -3323,7 +3322,8 @@
|
|||
"By approving access for this device, it will have full access to your account.": "By approving access for this device, it will have full access to your account.",
|
||||
"Scan the QR code below with your device that's signed out.": "Scan the QR code below with your device that's signed out.",
|
||||
"Start at the sign in screen": "Start at the sign in screen",
|
||||
"Select 'Scan QR code'": "Select 'Scan QR code'",
|
||||
"Select '%(scanQRCode)s'": "Select '%(scanQRCode)s'",
|
||||
"Scan QR code": "Scan QR code",
|
||||
"Review and approve the sign in": "Review and approve the sign in",
|
||||
"Connecting...": "Connecting...",
|
||||
"Waiting for device to sign in": "Waiting for device to sign in",
|
||||
|
|
@ -3571,7 +3571,7 @@
|
|||
"You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
|
||||
"You're signed out": "You're signed out",
|
||||
"Clear personal data": "Clear personal data",
|
||||
"Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
|
||||
"Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
|
||||
"Follow the instructions sent to <b>%(email)s</b>": "Follow the instructions sent to <b>%(email)s</b>",
|
||||
"Wrong email address?": "Wrong email address?",
|
||||
"Re-enter email address": "Re-enter email address",
|
||||
|
|
@ -3584,7 +3584,7 @@
|
|||
"The email address doesn't appear to be valid.": "The email address doesn't appear to be valid.",
|
||||
"Sign in instead": "Sign in instead",
|
||||
"Verify your email to continue": "Verify your email to continue",
|
||||
"We need to know it’s you before resetting your password.\n Click the link in the email we just sent to <b>%(email)s</b>": "We need to know it’s you before resetting your password.\n Click the link in the email we just sent to <b>%(email)s</b>",
|
||||
"We need to know it’s you before resetting your password. Click the link in the email we just sent to <b>%(email)s</b>": "We need to know it’s you before resetting your password. Click the link in the email we just sent to <b>%(email)s</b>",
|
||||
"Commands": "Commands",
|
||||
"Command Autocomplete": "Command Autocomplete",
|
||||
"Emoji Autocomplete": "Emoji Autocomplete",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue