Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
284b8803c0
9 changed files with 48 additions and 48 deletions
|
@ -43,18 +43,18 @@
|
|||
"%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
|
||||
"%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
|
||||
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
|
||||
"Invite new group members": "Invite new group members",
|
||||
"Who would you like to add to this group?": "Who would you like to add to this group?",
|
||||
"Invite new community members": "Invite new community members",
|
||||
"Who would you like to add to this community?": "Who would you like to add to this community?",
|
||||
"Name or matrix ID": "Name or matrix ID",
|
||||
"Invite to Group": "Invite to Group",
|
||||
"Add rooms to the group": "Add rooms to the group",
|
||||
"Which rooms would you like to add to this group?": "Which rooms would you like to add to this group?",
|
||||
"Invite to Community": "Invite to Community",
|
||||
"Add rooms to the community": "Add rooms to the community",
|
||||
"Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
|
||||
"Room name or alias": "Room name or alias",
|
||||
"Add to group": "Add to group",
|
||||
"Add to community": "Add to community",
|
||||
"Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
|
||||
"Invites sent": "Invites sent",
|
||||
"Your group invitations have been sent.": "Your group invitations have been sent.",
|
||||
"Failed to invite users group": "Failed to invite users group",
|
||||
"Your community invitations have been sent.": "Your community invitations have been sent.",
|
||||
"Failed to invite users community": "Failed to invite users community",
|
||||
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
|
||||
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
|
||||
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
|
||||
|
@ -483,14 +483,14 @@
|
|||
"Home server URL": "Home server URL",
|
||||
"Identity server URL": "Identity server URL",
|
||||
"What does this mean?": "What does this mean?",
|
||||
"Remove from group": "Remove from group",
|
||||
"Failed to remove user from group": "Failed to remove user from group",
|
||||
"Filter group members": "Filter group members",
|
||||
"Filter group rooms": "Filter group rooms",
|
||||
"Failed to remove room from group": "Failed to remove room from group",
|
||||
"Remove from community": "Remove from community",
|
||||
"Failed to remove user from community": "Failed to remove user from community",
|
||||
"Filter community members": "Filter community members",
|
||||
"Filter community rooms": "Filter community rooms",
|
||||
"Failed to remove room from community": "Failed to remove room from community",
|
||||
"Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
|
||||
"Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
|
||||
"Removing a room from the group will also remove it from the group page.": "Removing a room from the group will also remove it from the group page.",
|
||||
"Removing a room from the community will also remove it from the community page.": "Removing a room from the community will also remove it from the community page.",
|
||||
"Remove": "Remove",
|
||||
"Unknown Address": "Unknown Address",
|
||||
"NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
|
||||
|
@ -580,13 +580,13 @@
|
|||
"Confirm Removal": "Confirm Removal",
|
||||
"Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
|
||||
"%(actionVerb)s this person?": "%(actionVerb)s this person?",
|
||||
"Group IDs must be of the form +localpart:%(domain)s": "Group IDs must be of the form +localpart:%(domain)s",
|
||||
"It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
|
||||
"Community IDs must be of the form +localpart:%(domain)s": "Community IDs must be of the form +localpart:%(domain)s",
|
||||
"It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s": "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s",
|
||||
"Room creation failed": "Room creation failed",
|
||||
"Create Group": "Create Group",
|
||||
"Group Name": "Group Name",
|
||||
"Create Community": "Create Community",
|
||||
"Community Name": "Community Name",
|
||||
"Example": "Example",
|
||||
"Group ID": "Group ID",
|
||||
"Community ID": "Community ID",
|
||||
"+example:%(domain)s": "+example:%(domain)s",
|
||||
"Create": "Create",
|
||||
"Create Room": "Create Room",
|
||||
|
@ -678,9 +678,9 @@
|
|||
"Add rooms to this community": "Add rooms to this community",
|
||||
"Featured Rooms:": "Featured Rooms:",
|
||||
"Featured Users:": "Featured Users:",
|
||||
"%(inviter)s has invited you to join this group": "%(inviter)s has invited you to join this group",
|
||||
"You are a member of this group": "You are a member of this group",
|
||||
"You are an administrator of this group": "You are an administrator of this group",
|
||||
"%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
|
||||
"You are a member of this community": "You are a member of this community",
|
||||
"You are an administrator of this community": "You are an administrator of this community",
|
||||
"Community Member Settings": "Community Member Settings",
|
||||
"Publish this community on your profile": "Publish this community on your profile",
|
||||
"Long Description (HTML)": "Long Description (HTML)",
|
||||
|
@ -700,7 +700,7 @@
|
|||
"Logout": "Logout",
|
||||
"You are a member of these communities:": "You are a member of these communities:",
|
||||
"Error whilst fetching joined communities": "Error whilst fetching joined communities",
|
||||
"Groups": "Groups",
|
||||
"Communities": "Communities",
|
||||
"Create a new community": "Create a new community",
|
||||
"Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.",
|
||||
"Join an existing community": "Join an existing community",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue