Richard van der Hoff
4bc252a16b
delint src/Lifecycle
2017-05-31 17:28:08 +01:00
Amandine
e9cb13035b
Translated using Weblate (French)
...
Currently translated at 100.0% (770 of 770 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 16:05:37 +00:00
RiotTranslate
ccbfdcc661
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 15:15:41 +00:00
Bamstam
53502c9640
Translated using Weblate (German)
...
Currently translated at 100.0% (768 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 15:15:41 +00:00
Jean GB
396545b783
Translated using Weblate (French)
...
Currently translated at 99.3% (763 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 15:15:39 +00:00
Richard van der Hoff
2d73f094ff
Delint MatrixChat, again ( #979 )
...
grrr.
2017-05-31 15:09:09 +01:00
Kegsay
861cae8779
Merge pull request #978 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-31 14:12:38 +01:00
Kegsay
ecd58a00c6
Merge pull request #955 from Bitim/feature/rtl-languages-support
...
Add partial support for RTL languages
2017-05-31 14:11:24 +01:00
daniel tygel
75d2b2319d
translate directly in pt_BR.json
2017-05-31 09:10:19 -03:00
daniel tygel
d4a89cc2df
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-05-31 09:09:27 -03:00
dtygel
3b7b1d6206
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (768 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-31 12:02:33 +00:00
RiotTranslate
b5194cfc80
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 09:55:58 +00:00
Bamstam
dbf5ec632e
Translated using Weblate (German)
...
Currently translated at 100.0% (768 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 09:55:53 +00:00
Jean GB
117e6b8fc3
Translated using Weblate (French)
...
Currently translated at 99.2% (762 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 09:55:52 +00:00
Luke Barnard
532198dd10
Merge pull request #976 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-31 09:55:23 +01:00
Kegan Dougal
1ab52652f7
Strip out sanitizeHtml stuff as it's not required
...
As per https://github.com/matrix-org/matrix-react-sdk/pull/968#issuecomment-304946341
2017-05-31 09:29:43 +01:00
Krombel
a72fe7b2f5
Translated using Weblate (German)
...
Currently translated at 100.0% (768 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 04:16:24 +00:00
Amandine
0c918f242f
Translated using Weblate (French)
...
Currently translated at 97.7% (751 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 04:16:24 +00:00
Krombel
a5fa479ac5
Translated using Weblate (German)
...
Currently translated at 100.0% (768 of 768 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 23:37:59 +00:00
RiotTranslate
549875ba0a
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 23:22:31 +00:00
Amandine
c1cdf79036
Translated using Weblate (French)
...
Currently translated at 98.0% (751 of 766 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 23:22:30 +00:00
Krombel
12ca5d7288
Translated using Weblate (German)
...
Currently translated at 100.0% (766 of 766 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 23:22:29 +00:00
Michael Telatynski
dcd99ac3de
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
...
# Conflicts:
# src/components/structures/UserSettings.js
# src/i18n/strings/en_EN.json
First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553
change wording and i18n it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:46:51 +01:00
daniel tygel
f4e5039e70
add string to translate
2017-05-30 19:01:23 -03:00
daniel tygel
12f923bc81
add new string to translate
2017-05-30 18:56:52 -03:00
RiotTranslate
5cb4dbfd4e
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 20:30:35 +00:00
dtygel
8f88dcbf40
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 99.7% (763 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 20:30:35 +00:00
Bamstam
13fa3ac1f0
Translated using Weblate (German)
...
Currently translated at 100.0% (765 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 20:30:34 +00:00
Amandine
aa40653d5f
Translated using Weblate (French)
...
Currently translated at 91.8% (703 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 20:30:34 +00:00
Szimszon
b6bc641b3a
Added translation using Weblate (Hungarian)
2017-05-30 20:30:31 +00:00
Marcel
54b8afec38
Fix use of wrong char
2017-05-30 21:47:38 +02:00
Marcel
4d7ac1b828
Fix missing string in the room settings
2017-05-30 21:46:07 +02:00
Matthew Hodgson
48a2ad93da
fix {integrationsUrl} thinko
2017-05-30 20:32:12 +01:00
Matthew Hodgson
d74de136d6
Merge pull request #970 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-30 20:18:55 +01:00
turt2live
583fdfbb9f
Support 12hr time in full date
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 13:12:27 -06:00
Bamstam
4228b23913
Translated using Weblate (German)
...
Currently translated at 100.0% (765 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:58:37 +00:00
dtygel
e97a48d224
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 90.8% (695 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:42:53 +00:00
dtygel
0b23858ae7
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 89.6% (686 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:27:14 +00:00
Bamstam
e0ba5f0e1a
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:27:13 +00:00
Amandine
9f5f351d22
Translated using Weblate (French)
...
Currently translated at 91.6% (701 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 18:27:13 +00:00
RiotTranslate
5b31390435
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:16:36 +00:00
Krombel
1f8dea6346
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:16:36 +00:00
Amandine
63e9a22168
Translated using Weblate (French)
...
Currently translated at 88.7% (679 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 17:16:36 +00:00
Matthew Hodgson
5781275392
Merge pull request #968 from matrix-org/kegan/translation-mcguffin
...
Add _tJsx()
2017-05-30 18:13:27 +01:00
RiotTranslate
3261f5777a
Update from Weblate. ( #966 )
...
* Translated using Weblate (German)
Currently translated at 95.4% (727 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 96.5% (736 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 96.3% (737 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 97.9% (749 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 98.0% (750 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 98.1% (751 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.2% (759 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.3% (760 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.4% (761 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:09:17 +01:00
Krombel
b6f831559e
Translated using Weblate (German)
...
Currently translated at 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:04:27 +00:00
Bamstam
c72ec5d3c7
Translated using Weblate (German)
...
Currently translated at 99.4% (761 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:01:37 +00:00
Bamstam
14bf45ffb6
Translated using Weblate (German)
...
Currently translated at 99.3% (760 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:00:11 +00:00
Krombel
6c0a142e60
Translated using Weblate (German)
...
Currently translated at 99.2% (759 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:58:56 +00:00
Kegan Dougal
63a998ceb7
Allow span...
2017-05-30 17:37:13 +01:00
Weblate Admin
b958ed51c2
Translated using Weblate (German)
...
Currently translated at 98.1% (751 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:36:52 +00:00
Weblate Admin
3c98b57a18
Translated using Weblate (German)
...
Currently translated at 98.0% (750 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:35:12 +00:00
RiotTranslate
0e262e70f3
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 16:28:57 +00:00
Krombel
b09c673c6b
Translated using Weblate (German)
...
Currently translated at 97.9% (749 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:50:50 +00:00
turt2live
d446410bdf
Remove space between time and AM/PM
...
Part of addressing vector-im/riot-web#4046
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 09:31:16 -06:00
Kegan Dougal
1d67358525
Make it work with multiple regexps
2017-05-30 16:17:42 +01:00
Krombel
32ec5ec905
Translated using Weblate (German)
...
Currently translated at 96.3% (737 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:14:29 +00:00
RiotTranslate
8a1f9ca38f
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 15:04:28 +00:00
Krombel
8ee377b119
Translated using Weblate (German)
...
Currently translated at 96.5% (736 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:04:25 +00:00
Matthew Hodgson
93a35dc07a
Merge branch 'develop' into t3chguy/piwik
2017-05-30 15:58:55 +01:00
Krombel
5a51da4196
Translated using Weblate (German)
...
Currently translated at 95.4% (727 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 14:55:36 +00:00
Kegan Dougal
bb030dabc4
Add _tJsx()
2017-05-30 15:55:21 +01:00
Marcel
70e7d81093
More i18n strings ( #963 )
...
* Add i18n for E2E import and Export Dialogs
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add various previous missing i18n strings
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Translate CreateRoomButton
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ChatInviteDialog and fix missing to.
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ConfitmRedactDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeactivateAccountDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SessionRestoreErrorDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SetDisplayNameDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownDeviceDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AddressTile translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyButtons translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add Dropdown translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UserSelector translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CaptchaForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CasLogin translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CustomServerDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add InteractiveAuthEntryComponents translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add LoginFooter translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add RegistrationForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ServerConfig translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MAudioBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MImageBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MVideoBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add TextualBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UrlPreviewSettings translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AuxPanel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add PresenceLabel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* fix syntax error
* weird space :P
* missing ','
* fix missing value
* fix json fail
* remove acidential added file
* fix another json fail
2017-05-30 15:09:57 +01:00
RiotTranslate
dc241c079c
[WEBLATE] fix json
2017-05-30 13:37:04 +00:00
RiotTranslate
d817924d9a
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 13:33:35 +00:00
Matthew Hodgson
9b8b562499
Merge pull request #960 from matrix-org/luke/fix-chat-invite-perf
...
Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs()
2017-05-30 14:26:37 +01:00
RiotTranslate
f8db8fdd9b
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 13:21:24 +00:00
RiotTranslate
9f5a359f10
[WEBLATE] fix merge issues
2017-05-30 13:20:50 +00:00
Matthew Hodgson
d2703276dc
Merge pull request #958 from turt2live/patch-1
...
Say "X removed the room name" instead of showing nothing
2017-05-30 14:20:49 +01:00
Matthew Hodgson
a3a63b18d2
Merge pull request #959 from matrix-org/t3chguy/fix_roomheader
...
roomview/roomheader fixes
2017-05-30 14:19:33 +01:00
Bhuvan Krishna
612a1b47f5
Translated using Weblate (Telugu)
...
Currently translated at 0.1% (1 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/te/
2017-05-30 13:12:14 +00:00
Amandine
1dfc228954
Translated using Weblate (French)
...
Currently translated at 99.7% (673 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 12:30:22 +00:00
Bhuvan Krishna
3f3b77a635
Added translation using Weblate (Telugu)
2017-05-30 12:30:21 +00:00
Luke Barnard
4e4c670458
Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs()
2017-05-30 12:34:19 +01:00
Michael Telatynski
ee6789ed15
change aux order so room settings is top most, forwarding could go weird
...
if you clicked roomsettings whilst forwarding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:22:27 +01:00
Michael Telatynski
baba2e12e2
fix weird indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:21:33 +01:00
Michael Telatynski
ff9141e424
add a hideCancel flag as some things have own cancel etc on RoomHeader
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 11:20:41 +01:00
Juorder Gonzalez
4b60532442
Translated using Weblate (Spanish)
...
Currently translated at 48.7% (329 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-30 08:52:06 +00:00
dtygel
457d44fe49
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 99.7% (673 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 08:52:05 +00:00
Amandine
b0942d4fcf
Translated using Weblate (French)
...
Currently translated at 99.7% (673 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 08:52:05 +00:00
Bart Ribbers
9090338eb3
Translated using Weblate (Dutch)
...
Currently translated at 29.6% (200 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-30 08:52:05 +00:00
Radium
119db915a6
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 22.9% (155 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-05-30 08:52:04 +00:00
turt2live
d9d25e26d2
Say "X removed the room name" instead of showing nothing
...
Addresses vector-im/riot-web#4072
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-29 23:21:14 -06:00
RiotTranslate
de1cacf983
Update from Weblate. ( #953 )
...
* Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Added translation using Weblate (Spanish)
* Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
* Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
* Translated using Weblate (Spanish)
Currently translated at 3.2% (22 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
* Added translation using Weblate (Chinese (Simplified))
* Translated using Weblate (Dutch)
Currently translated at 2.6% (18 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
* Translated using Weblate (Chinese (Simplified))
Currently translated at 11.7% (79 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
* Translated using Weblate (Spanish)
Currently translated at 14.6% (99 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
* Translated using Weblate (French)
Currently translated at 55.8% (377 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 04:01:15 +01:00
Michael Telatynski
bdf94b14a4
changed my mind, no point sending spinner over to analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 00:10:36 +01:00
Matthew Hodgson
970784f0c0
Merge pull request #956 from matrix-org/t3chguy/i18n_electron
...
fix i18n in a situation where navigator.languages=[]
2017-05-30 00:07:30 +01:00
Michael Telatynski
5dde23ae54
fall back to className if no props?.title - for mx_Dialog_spinner primarily
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 00:01:36 +01:00
Michael Telatynski
dc2d32670b
clean up file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 23:52:55 +01:00
Michael Telatynski
bfc7302fba
fix i18n typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 23:51:05 +01:00
Michael Telatynski
7e02977c27
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:32:45 +01:00
Nerkdesign
13d82483a5
Translated using Weblate (French)
...
Currently translated at 55.8% (377 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-29 21:08:29 +00:00
Michael Telatynski
a2229ced11
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
2017-05-29 21:56:45 +01:00
Michael Telatynski
1bba419235
add flow annotation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 20:02:46 +01:00
Michael Telatynski
c614c03b03
fix i18n in a situation where navigator.languages=[]
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:59:29 +01:00
Michael Telatynski
4c607091d4
make Analytics use new method for finding Platform name, now human friendly :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:52:00 +01:00
Michael Telatynski
d484372c7f
introduce concept of platform name, based on class name, because webpack.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:50:04 +01:00
Michael Telatynski
b9457a0681
Track Notifier events so we know what % have toolbar/enabled/etc
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:15:52 +01:00
Michael Telatynski
541cea020e
use 4/5 of the default custom vars for useful things :D
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:04:37 +01:00
Michael Telatynski
b65e4960a5
move Dialog analytics to Modal controller
...
mark title as required, it sorta is, why isn't this based on BaseDialog?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 17:39:03 +01:00
Michael Telatynski
c2dca0c805
move to use async Piwik interface, means pre-piwik load things will work too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 17:26:48 +01:00
Juorder Gonzalez
629efd1cae
Translated using Weblate (Spanish)
...
Currently translated at 14.6% (99 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:51:50 +00:00
Bart Ribbers
e99e5c5efc
Translated using Weblate (Dutch)
...
Currently translated at 2.6% (18 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-29 15:51:49 +00:00
Radium
fdeb29c8ba
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 11.7% (79 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-05-29 15:51:49 +00:00
saul.kredi@krutt.org
4afba2f796
Add support for RTL languages
2017-05-29 18:44:39 +03:00
Radium
e1e2d83361
Added translation using Weblate (Chinese (Simplified))
2017-05-29 15:18:55 +00:00
Juorder Gonzalez
949077db00
Translated using Weblate (Spanish)
...
Currently translated at 3.2% (22 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:33 +00:00
Juorder Gonzalez
9ea8e2c459
Translated using Weblate (Spanish)
...
Currently translated at 2.8% (19 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:05 +00:00
Juorder Gonzalez
578e10d972
Translated using Weblate (Spanish)
...
Currently translated at 2.8% (19 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:07:11 +00:00
RiotTranslate
245a2793ed
Merge remote-tracking branch 'origin/develop' into develop
2017-05-29 14:33:58 +00:00
Bamstam
6ccf55b425
Translated using Weblate (German)
...
Currently translated at 100.0% (675 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-29 14:33:58 +00:00
Juorder Gonzalez
4a712a443c
Added translation using Weblate (Spanish)
2017-05-29 14:33:56 +00:00
Michael Telatynski
42e20c38f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik
2017-05-29 15:23:05 +01:00
Michael Telatynski
9b8dcaf274
make analytics setting use new thing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:11:37 +01:00
Michael Telatynski
97d0c41d30
fix ugly special casing in generic settings renderer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:08:11 +01:00
Michael Telatynski
75e386e0ee
fix async behaviour, tracking should maybe use Async Piwik tracker
...
events before piwik loads are lost currently
blocking for piwik would be stupid.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:56:41 +01:00
Michael Telatynski
f5d336103e
add opt out / un opt out toggle
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
Michael Telatynski
7e8123e5fe
move all init/enable/disable logic to Analytics/MatrixChat
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:26:29 +01:00
Matthew Hodgson
229eef4624
fix missing translation
2017-05-29 13:29:27 +01:00
RiotTranslate
93b958419a
Merge remote-tracking branch 'origin/develop' into develop
2017-05-28 23:08:11 +00:00
Bamstam
d325582344
Translated using Weblate (German)
...
Currently translated at 100.0% (675 of 675 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 23:08:09 +00:00
Travis Ralston
1b6685c5da
Merge branch 'develop' into travis/redact-to-remove
2017-05-28 17:45:32 -04:00
Matthew Hodgson
4fa454ed45
Merge branch 'develop' into weblate-riot-web-matrix-react-sdk
2017-05-28 21:46:17 +01:00
Matthew Hodgson
0acfe7eddd
Merge pull request #952 from matrix-org/t3chguy/fix_slashcommands
...
fix mis-linting - missed it in code review :(
2017-05-28 21:45:25 +01:00
Matthew Hodgson
51c3c121d4
fix dup i18n keys found by check-i18n.pl
2017-05-28 21:32:24 +01:00
Matthew Hodgson
67323e3690
fix vars in RU translation (how did i not commit this yesterday?)
2017-05-28 21:28:03 +01:00
Michael Telatynski
3ecd9964ec
fix vector-im/riot-web#4059 - missed it in code review :(
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 20:24:33 +01:00
Radium
4e2e1d3d51
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 3.2% (22 of 674 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-05-28 16:38:35 +00:00
Radium
dc710f4644
Added translation using Weblate (Chinese (Traditional))
2017-05-28 16:07:47 +00:00
Rinat
b709c981c0
Translated using Weblate (Russian)
...
Currently translated at 91.0% (614 of 674 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-28 13:35:29 +00:00
PureTryOut
00a6d218a5
Translated using Weblate (Dutch)
...
Currently translated at 0.2% (2 of 674 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-28 13:35:29 +00:00
Michael Telatynski
3a8288bf34
remove identical duplicates in fr
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:43:44 +01:00
Michael Telatynski
8d64bf27af
fix weird mangled key vals (and dups)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:38:37 +01:00
PureTryOut
38abda3c56
Added translation using Weblate (Dutch)
2017-05-28 12:35:34 +00:00
Michael Telatynski
c8732582d3
remove most duplicate keys in en_EN
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:35:30 +01:00
Michael Telatynski
b55503e67f
i18n the forwarding aux panel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:27:57 +01:00
Michael Telatynski
fb3187b58e
change event wording
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:26:33 +01:00
Michael Telatynski
0a1b361141
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik
2017-05-28 13:21:33 +01:00
Michael Telatynski
7cebfc1ff1
change analytics to set custom url rather than custom title
...
this way exit/entry/page transition will work better
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:19:03 +01:00
RiotTranslate
f08d40fb7b
Merge remote-tracking branch 'origin/develop' into develop
2017-05-28 11:10:16 +00:00
Bamstam
b1f21f7d4e
Translated using Weblate (German)
...
Currently translated at 99.7% (672 of 674 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 11:10:16 +00:00
Michael Telatynski
eb6136b957
remove dispatcher
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:26:41 +01:00
Matthew Hodgson
accc17a39a
Merge pull request #812 from t3chguy/forward_message
...
Message Forwarding
2017-05-28 02:37:31 +01:00
Matthew Hodgson
10a9313bba
Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal
...
don't focus_composer on window focus
2017-05-27 23:30:00 +01:00
Michael Telatynski
f93fd1c408
remove unrelated comment, my copy pasting is way too obvious xD
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 21:08:00 +01:00
Michael Telatynski
45cd80dedb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik
2017-05-27 20:59:35 +01:00
Michael Telatynski
98c2f9201b
initial piwik stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:47:09 +01:00
Marcel
8935e9706e
Change variable name as mentioned by t3chguy
2017-05-27 21:21:23 +02:00
Marcel
a30110b5d3
Fix vector-im/riot-web#4042
2017-05-27 21:11:00 +02:00
Matthew Hodgson
063230af03
fix typo breaking russian i18n
2017-05-27 19:51:44 +01:00
Matthew Hodgson
71bc15c2fc
fix .
2017-05-27 19:03:18 +01:00
Michael Telatynski
4cd7964b58
remove window onFocus handling entirely
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 18:43:59 +01:00
Matthew Hodgson
3703306a9e
oops
2017-05-27 18:35:18 +01:00
Matthew Hodgson
8766f8ab7e
sync punctuation
2017-05-27 18:22:36 +01:00
Matthew Hodgson
3302fc690f
fix all missing translations picked up by check-i18n.pl
2017-05-27 18:20:44 +01:00
Matthew Hodgson
1eb7993aa7
Merge pull request #946 from matrix-org/t3chguy/fix_imports
...
import _t, drop two unused imports
2017-05-27 18:08:00 +01:00
Michael Telatynski
8524f5868c
import _t, drop two unused imports
...
without this FilePanel would ever-load
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 17:59:11 +01:00
Matthew Hodgson
c61ca42261
oops, fix quoting
2017-05-27 17:41:54 +01:00
Matthew Hodgson
f442a665c8
fix more i18n punctuation fails
2017-05-27 17:36:02 +01:00
Matthew Hodgson
730258bd3c
fix punctuation on e2e warning
2017-05-27 17:30:32 +01:00
Matthew Hodgson
957aa0403d
fix https://github.com/vector-im/riot-web/issues/4052
2017-05-27 16:03:07 +01:00
Matthew Hodgson
f0f5bc83f2
fix more weirdly inconsistent fullstops
2017-05-27 15:54:52 +01:00
Matthew Hodgson
6d6b14a26c
fix spurious missing translation ('Default')
2017-05-27 15:52:24 +01:00
Matthew Hodgson
398ad4798e
fix string typo
2017-05-27 15:02:20 +01:00
Matthew Hodgson
355f4974af
standardise i18n TextForEvent to include punctuation.
...
fixes lots of missing & inconsistent strings, as somehow some of the i18n files had ended up with the raw strings being inconsistent in terms of punctuation, causing problems as per https://github.com/vector-im/riot-web/issues/4045
2017-05-27 15:02:20 +01:00
Michael Telatynski
8e1db84bee
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal
2017-05-27 14:29:06 +01:00
Michael Telatynski
2bcb381aa7
maybe window focus should be ignored so focus is left as what it was
...
but with this at least clicking on a text input will not make you
be thrown into composer instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 14:19:34 +01:00
Matthew Hodgson
b8b6a87423
fixing missing EN translation
2017-05-27 13:58:20 +01:00
Matthew Hodgson
5ed1bc5873
Merge pull request #940 from matrix-org/matthew/always-show-ts
...
actually wire up alwaysShowTimestamps
2017-05-27 13:03:39 +01:00
nouts
ad2c84375d
Translated using Weblate (French)
...
Currently translated at 57.3% (378 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 11:30:00 +00:00
Amandine
9fc20cbd34
Translated using Weblate (French)
...
Currently translated at 55.8% (368 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 07:08:41 +00:00
RiotTranslate
59cb7ad0e6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 23:20:37 +00:00
dambador
5d08393eb5
Translated using Weblate (Russian)
...
Currently translated at 92.8% (612 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 23:20:37 +00:00
Krombel
88f760a53f
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 23:20:36 +00:00
Amandine
b6cd3fcdd2
Translated using Weblate (French)
...
Currently translated at 51.5% (340 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 23:20:36 +00:00
Matthew Hodgson
03194e66b3
actually wire up alwaysShowTimestamps
2017-05-27 00:14:16 +01:00
Matthew Hodgson
81704a5b5e
s/username/User name/
2017-05-27 00:13:16 +01:00
David Baker
1c841f27d7
Merge pull request #938 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-26 23:01:13 +01:00
David Baker
477396f820
Use first language preference, not last
2017-05-26 22:29:03 +01:00
Stanislav N
594247dfa9
Translated using Weblate (Russian)
...
Currently translated at 66.3% (437 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:33:25 +00:00
Stanislav N
53cb6d1d76
Translated using Weblate (Russian)
...
Currently translated at 65.8% (434 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:11:46 +00:00
RiotTranslate
765034dc19
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 20:10:47 +00:00
Stanislav N
5f2012102c
Translated using Weblate (Russian)
...
Currently translated at 65.8% (434 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:10:47 +00:00
Krombel
08529ba5a8
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 20:10:47 +00:00
Travis Ralston
65dd2d4db1
Fix PM being AM
...
Fixes https://github.com/vector-im/riot-web/issues/4043
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-26 13:43:01 -06:00
RiotTranslate
e46b63dc5a
[WEBLATE] fix merging issues
2017-05-26 18:51:55 +00:00
Krombel
c138e4d92e
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:40:57 +00:00
Amandine
9fcee811cb
Translated using Weblate (French)
...
Currently translated at 25.7% (170 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:40:56 +00:00
Amandine
a77663d18b
Translated using Weblate (French)
...
Currently translated at 25.6% (169 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:18:16 +00:00
Krombel
1edad35c98
Translated using Weblate (German)
...
Currently translated at 100.0% (659 of 659 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:18:14 +00:00
Matthew Hodgson
e5ef9f3e3a
Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep
...
pass call state through dispatcher, for poor electron
2017-05-26 19:09:10 +01:00
David Baker
cddfe7e6ef
Fix inconsistent quoting in topic messages
2017-05-26 19:00:44 +01:00
David Baker
563b85ceb8
Merge https://github.com/MTRNord/matrix-react-sdk/pull/115
2017-05-26 18:53:23 +01:00
David Baker
647c1b6169
Once more, with braces
2017-05-26 18:19:32 +01:00
David Baker
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
Luke Barnard
276d3cad9c
Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix
...
Remove suffix and prefix from login input username
2017-05-26 18:07:10 +01:00
David Baker
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
David Baker
cf0073a631
Missing translations in User Interface section
2017-05-26 17:59:19 +01:00
David Baker
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
David Baker
40680d55e0
Fix merge fail
2017-05-26 17:55:48 +01:00