imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview

Browse source
This commit is contained in:
David Baker 2017-07-10 14:03:30 +01:00
commit 696c72be2b
12 changed files with 95 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/i18n/strings/en_EN.json
View file

@ -948,10 +948,10 @@
"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",
"Room creation failed": "Room creation failed",
"You are a member of these groups": "You are a member of these groups",
"You are a member of these groups:": "You are a member of these groups:",
"Create a group 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 group 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 group": "Join an existing group",
"To join an exisitng group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.": "To join an exisitng group you'll have to know its group identifier; this will look something like <i>+example:matrix.org</i>.",
"Featured Rooms:": "Featured Rooms:",
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):"
"Error whilst fetching joined groups": "Error whilst fetching joined groups"
}