Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop

Conflicts: src/i18n/strings/cs.json src/i18n/strings/de_DE.json src/i18n/strings/fi.json src/i18n/strings/fr.json src/i18n/strings/it.json src/i18n/strings/nl.json src/i18n/strings/ru.json src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
parent 55cdbe6655 b73e28add3
commit 11b4ffe302
235 changed files with 6666 additions and 4357 deletions
@@ -26,9 +26,6 @@
    "Hide removed messages": "Hide removed messages",
    "Always show message timestamps": "Always show message timestamps",
    "Authentication": "Authentication",
-    "all room members": "all room members",
-    "all room members, from the point they are invited": "all room members, from the point they are invited",
-    "all room members, from the point they joined": "all room members, from the point they joined",
    "an address": "an address",
    "and": "and",
    "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
@@ -42,7 +39,6 @@
    "An email has been sent to": "An email has been sent to",
    "A new password must be entered.": "A new password must be entered.",
    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
-    "anyone": "anyone",
    "An error has occurred.": "An error has occurred.",
    "Anyone": "Anyone",
    "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -118,7 +114,6 @@
    "Device key:": "Device key:",
    "Devices": "Devices",
    "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
-    "Direct Chat": "Direct Chat",
    "Direct chats": "Direct chats",
    "disabled": "disabled",
    "Disable inline URL previews by default": "Disable inline URL previews by default",
@@ -156,7 +151,6 @@
    "Failed to delete device": "Failed to delete device",
    "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
    "Failed to join room": "Failed to join room",
-    "Failed to join the room": "Failed to join the room",
    "Failed to kick": "Failed to kick",
    "Failed to leave room": "Failed to leave room",
    "Failed to load timeline position": "Failed to load timeline position",
@@ -188,10 +182,6 @@
    "Found a bug?": "Found a bug?",
    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
    "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
-    "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
-    "Guest users can't create new rooms. Please register to create room and start a chat.": "Guest users can't create new rooms. Please register to create room and start a chat.",
-    "Guest users can't upload files. Please register to upload.": "Guest users can't upload files. Please register to upload.",
-    "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
    "had": "had",
    "Hangup": "Hangup",
@@ -231,6 +221,16 @@
    "Kick": "Kick",
    "Kicks user with given id": "Kicks user with given id",
    "Labs": "Labs",
+    "Ignored Users": "Ignored Users",
+    "Ignore": "Ignore",
+    "Unignore": "Unignore",
+    "User Options": "User Options",
+    "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
+    "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
+    "Unignored user": "Unignored user",
+    "Ignored user": "Ignored user",
+    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
+    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
    "Leave room": "Leave room",
    "left and rejoined": "left and rejoined",
    "left": "left",
@@ -242,13 +242,18 @@
    "Login as guest": "Login as guest",
    "Logout": "Logout",
    "Low priority": "Low priority",
-    "%(senderName)s made future room history visible to": "%(senderName)s made future room history visible to",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
    "Manage Integrations": "Manage Integrations",
    "Markdown is disabled": "Markdown is disabled",
    "Markdown is enabled": "Markdown is enabled",
    "matrix-react-sdk version:": "matrix-react-sdk version:",
    "Matrix Apps": "Matrix Apps",
    "Members only": "Members only",
+    "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
    "Missing room_id in request": "Missing room_id in request",
    "Missing user_id in request": "Missing user_id in request",
@@ -257,13 +262,11 @@
    "Moderator": "Moderator",
    "Must be viewing a room": "Must be viewing a room",
    "Mute": "Mute",
-    "my Matrix ID": "my Matrix ID",
    "Name": "Name",
    "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
    "Never send encrypted messages to unverified devices in this room": "Never send encrypted messages to unverified devices in this room",
    "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "New Composer & Autocomplete": "New Composer & Autocomplete",
    "New password": "New password",
    "New passwords don't match": "New passwords don't match",
    "New passwords must match each other.": "New passwords must match each other.",
@@ -292,9 +295,7 @@
    "Phone": "Phone",
    "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
    "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
-    "Please Register": "Please Register",
    "Power level must be positive integer.": "Power level must be positive integer.",
-    "Press": "Press",
    "Privacy warning": "Privacy warning",
    "Privileged Users": "Privileged Users",
    "Profile": "Profile",
@@ -367,13 +368,11 @@
    "Start Chat": "Start Chat",
    "Submit": "Submit",
    "Success": "Success",
-    "tag as %(tagName)s": "tag as %(tagName)s",
    "tag direct chat": "tag direct chat",
    "Tagged as: ": "Tagged as: ",
    "The default role for new room members is": "The default role for new room members is",
    "The main address for this room is": "The main address for this room is",
    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
-    "This action cannot be performed by a guest user. Please register to be able to do this.": "This action cannot be performed by a guest user. Please register to be able to do this.",
    "This email address is already in use": "This email address is already in use",
    "This email address was not found": "This email address was not found",
    "%(actionVerb)s this person?": "%(actionVerb)s this person?",
@@ -382,7 +381,6 @@
    "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
    "The remote side failed to pick up": "The remote side failed to pick up",
    "This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
-    "There was a problem logging in.": "There was a problem logging in.",
    "This room has no local addresses": "This room has no local addresses",
    "This room is not recognised.": "This room is not recognized.",
    "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
@@ -394,23 +392,15 @@
    "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
    "This room's internal ID is": "This room's internal ID is",
    "times": "times",
-    "To ban users": "To ban users",
    "to browse the directory": "to browse the directory",
-    "To configure the room": "To configure the room",
    "to demote": "to demote",
    "to favourite": "to favorite",
-    "To invite users into the room": "To invite users into the room",
    "to join the discussion": "to join the discussion",
-    "To kick users": "To kick users",
    "To link to a room it must have": "To link to a room it must have",
    "to make a room or": "to make a room or",
-    "To remove other users' messages": "To remove other users' messages",
    "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
    "to restore": "to restore",
-    "To send events of type": "To send events of type",
-    "To send messages": "To send messages",
    "to start a chat with someone": "to start a chat with someone",
-    "to tag as %(tagName)s": "to tag as %(tagName)s",
    "to tag direct chat": "to tag direct chat",
    "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
@@ -420,7 +410,6 @@
    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
    "Unable to add email address": "Unable to add email address",
    "Unable to remove contact information": "Unable to remove contact information",
-    "Unable to restore previous session": "Unable to restore previous session",
    "Unable to verify email address.": "Unable to verify email address.",
    "Unban": "Unban",
    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
@@ -433,7 +422,6 @@
    "unknown error code": "unknown error code",
    "Unknown room %(roomId)s": "Unknown room %(roomId)s",
    "Unknown (user, device) pair:": "Unknown (user, device) pair:",
-    "unknown": "unknown",
    "Unmute": "Unmute",
    "Unrecognised command:": "Unrecognized command:",
    "Unrecognised room alias:": "Unrecognized room alias:",
@@ -482,7 +470,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "You have entered an invalid contact. Try using their Matrix ID or email address.",
    "You have no visible notifications": "You have no visible notifications",
    "you must be a": "you must be a",
    "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
@@ -518,7 +505,6 @@
    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
    "Set a display name:": "Set a display name:",
-    "Set a Display Name": "Set a Display Name",
    "Upload an avatar:": "Upload an avatar:",
    "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
    "Missing password.": "Missing password.",
@@ -539,7 +525,6 @@
    "Room": "Room",
    "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
    "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
-    "Auto-complete": "Auto-complete",
    "Resend all": "Resend all",
    "(~%(searchCount)s results)": "(~%(searchCount)s results)",
    "Cancel": "Cancel",
@@ -615,6 +600,7 @@
    "Desktop specific": "Desktop specific",
    "Analytics": "Analytics",
    "Opt out of analytics": "Opt out of analytics",
+    "Banned by %(displayName)s": "Banned by %(displayName)s",
    "Options": "Options",
    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
    "Passphrases must match": "Passphrases must match",
@@ -631,7 +617,6 @@
    "You must join the room to see its files": "You must join the room to see its files",
    "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
    "Start new chat": "Start new chat",
-    "Guest users can't invite users. Please register.": "Guest users can't invite users. Please register.",
    "Failed to invite": "Failed to invite",
    "Failed to invite user": "Failed to invite user",
    "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
@@ -653,7 +638,6 @@
    "Unable to restore session": "Unable to restore session",
    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.",
    "Continue anyway": "Continue anyway",
-    "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?": "Your display name is how you'll appear to others when you speak in rooms. What would you like it to be?",
    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
@@ -665,6 +649,20 @@
    "Verify...": "Verify...",
    "ex. @bob:example.com": "ex. @bob:example.com",
    "Add User": "Add User",
+    "To send messages, you must be a": "To send messages, you must be a",
+    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+    "To configure the room, you must be a": "To configure the room, you must be a",
+    "To kick users, you must be a": "To kick users, you must be a",
+    "To ban users, you must be a": "To ban users, you must be a",
+    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
+    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
+    "To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
+    "To change the room's name, you must be a": "To change the room's name, you must be a",
+    "To change the room's main address, you must be a": "To change the room's main address, you must be a",
+    "To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
+    "To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
+    "To change the topic, you must be a": "To change the topic, you must be a",
+    "To modify widgets in the room, you must be a": "To modify widgets in the room, you must be a",
    "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
    "Sign in with CAS": "Sign in with CAS",
    "Custom Server Options": "Custom Server Options",
@@ -714,7 +712,7 @@
    "Accept": "Accept",
    "a room": "a room",
    "Add": "Add",
-    "Admin tools": "Admin tools",
+    "Admin Tools": "Admin tools",
    "And %(count)s more...": "And %(count)s more...",
    "Alias (optional)": "Alias (optional)",
    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
@@ -724,13 +722,11 @@
    "%(count)s new messages|other": "%(count)s new messages",
    "Custom": "Custom",
    "Decline": "Decline",
-    "Disable markdown formatting": "Disable markdown formatting",
    "Disable Notifications": "Disable Notifications",
    "Enable Notifications": "Enable Notifications",
    "Create new room": "Create new room",
    "Room directory": "Room directory",
    "Start chat": "Start chat",
-    "Welcome page": "Welcome page",
    "Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
    "Drop File Here": "Drop File Here",
    "Encrypted by a verified device": "Encrypted by a verified device",
@@ -756,7 +752,6 @@
    "Room contains unknown devices": "Room contains unknown devices",
    "%(roomName)s does not exist.": "%(roomName)s does not exist.",
    "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
-    "Searching known users": "Searching known users",
    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
    "Send anyway": "Send anyway",
    "Set": "Set",
@@ -838,6 +833,7 @@
    "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
    "This Home server does not support groups": "This Home server does not support groups",
    "Loading device info...": "Loading device info...",
+    "Message removed by %(userId)s": "Message removed by %(userId)s",
    "Groups": "Groups",
    "Create a new group": "Create a new group",
    "Create Group": "Create Group",