ec418891b1
Merge remote-tracking branch 'origin/develop' into develop
2017-05-27 11:30:00 +00:00
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
5a6baafc91
Merge pull request #942 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-27 11:22:30 +01:00
a56e3c3897
Merge remote-tracking branch 'origin/develop' into develop
2017-05-27 07:08:41 +00:00
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
98dc0daf33
Merge pull request #941 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-27 01:07:41 +01:00
59cb7ad0e6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 23:20:37 +00:00
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
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
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
03194e66b3
actually wire up alwaysShowTimestamps
2017-05-27 00:14:16 +01:00
81704a5b5e
s/username/User name/
2017-05-27 00:13:16 +01:00
1c841f27d7
Merge pull request #938 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-26 23:01:13 +01:00
477396f820
Use first language preference, not last
2017-05-26 22:29:03 +01:00
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
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
765034dc19
Merge remote-tracking branch 'origin/develop' into develop
2017-05-26 20:10:47 +00:00
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
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
db3d455a1d
Merge pull request #939 from turt2live/patch-1
...
Fix PM being AM
2017-05-26 21:05:46 +01:00
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
b5912d3c92
Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop
2017-05-26 18:52:03 +00:00
e46b63dc5a
[WEBLATE] fix merging issues
2017-05-26 18:51:55 +00:00
32207bd058
use develop js-sdk
2017-05-26 19:51:47 +01:00
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
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
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
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
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
cddfe7e6ef
Fix inconsistent quoting in topic messages
2017-05-26 19:00:44 +01:00
563b85ceb8
Merge https://github.com/MTRNord/matrix-react-sdk/pull/115
2017-05-26 18:53:23 +01:00
f4184bc695
Merge pull request #934 from matrix-org/dbkr/translations
...
Translations!
2017-05-26 18:38:04 +01:00
647c1b6169
Once more, with braces
2017-05-26 18:19:32 +01:00
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
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
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
cf0073a631
Missing translations in User Interface section
2017-05-26 17:59:19 +01:00
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
40680d55e0
Fix merge fail
2017-05-26 17:55:48 +01:00
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
84cef00f1f
Mismatched oneUser / severalUsers
2017-05-26 17:16:23 +01:00
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
0f8e560247
Add function to display i18n keys in UI
...
Avoids having to load translations in riot-web tests
2017-05-26 15:29:11 +01:00
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
bb344740dd
Add test languages file
2017-05-26 13:09:29 +01:00
0de0b8954d
Trailing whitespace
2017-05-26 12:03:36 +01:00
e44f3cc709
Fix tests
...
* Serve translation files from the karma server
* Port UserSettingsStore to ES6 exports because the test runner
gets confused by ES6 importing a commonjs module
* Remove extra spaces in translations strings for MELS
* Fix 'his/her' back to be 'their'
* Change test to expect singular 'invitation' for a single person
(there may be multiple invitations, but IMO this should be
'rejected n invitations' and we can play with the wording later,
I don't think the singular is any worse than the plural).
* set language in the MELS tests (and wait for it to complete)
* Don't bother setting lang in other tests for now
2017-05-26 11:58:45 +01:00
72b1f03238
Merge pull request #931 from matrix-org/dbkr/dont_put_src_in_resolve_root
...
Don't include src in the test resolve root
2017-05-25 23:29:47 +01:00
dfc8cf3f54
Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations
2017-05-25 23:16:39 +01:00
ba8e37a84e
Don't include src in the test resolve root
...
Don't include src in resolve root for the karma test, as otherwise
modules from react sdk get pulled in instead of npm libraries like
'extend' which breaks everything in really subtle ways.
2017-05-25 23:13:49 +01:00
RiotTranslate