Commit graph

3903 commits

Author SHA1 Message Date
Luke Barnard
95e38eb9c4 Remove cryptic log 2017-06-02 12:02:37 +01:00
dtygel
0b97d88766 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (826 of 826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 10:58:07 +00:00
David Baker
03f4f269ce Propagate room join errors to the UI
Dispatch so we can set the state in RoomViewStore. Show the error
when the room join fails (unsure if it's better to do this from
the component or the store). Remove unused joinError from roomview.
2017-06-02 11:53:10 +01:00
Luke Barnard
6e84b6e996 Display profile errors better 2017-06-02 11:50:58 +01:00
Luke Barnard
e88b52fa8f Add comment 2017-06-02 11:42:47 +01:00
Luke Barnard
6a9781f023 Remove redundant state 2017-06-02 11:41:09 +01:00
Luke Barnard
defecb1b14 Implement /user/@userid:domain?action=chat
This is a URL that can be used to start a chat with a user.
 - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
 - If the user is registered, they will not see the setMxId dialog.

fixes https://github.com/vector-im/riot-web/issues/4034
2017-06-02 11:36:18 +01:00
Bamstam
c9e8dd7352 Translated using Weblate (German)
Currently translated at 95.6% (771 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:33:02 +00:00
Bamstam
11b7b78162 Translated using Weblate (German)
Currently translated at 95.6% (771 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:32:50 +00:00
Bamstam
79f03eb957 Translated using Weblate (German)
Currently translated at 95.6% (771 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:32:39 +00:00
Bamstam
ce1b117e49 Translated using Weblate (German)
Currently translated at 95.6% (771 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:32:26 +00:00
RiotTranslate
4527d808f1 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 10:29:22 +00:00
Bamstam
527c596182 Translated using Weblate (German)
Currently translated at 95.6% (771 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:29:22 +00:00
Bamstam
d01cec0b7c Translated using Weblate (German)
Currently translated at 95.5% (770 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:18:03 +00:00
Kegan Dougal
a8ca7c899f Review comments 2017-06-02 11:16:08 +01:00
Luke Barnard
be7c2612e8 Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips
Show People/Rooms emptySubListTip even when total rooms !== 0
2017-06-02 11:10:48 +01:00
Amandine
f83c45f0c8 Translated using Weblate (French)
Currently translated at 100.0% (806 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-02 10:07:16 +00:00
Bamstam
d9632d3df5 Translated using Weblate (German)
Currently translated at 95.5% (770 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 09:56:26 +00:00
Kegan Dougal
f54c182eb1 Add remaining strings for vector-im/riot-web#4151 2017-06-02 10:47:08 +01:00
Kegan Dougal
d2e766e4f0 First round 2017-06-02 10:18:31 +01:00
Luke Barnard
7808994b71 Modify RVS test to wait until room loaded
This allows for the alias resolution to occur before a join is attempted. In theory, join_room could in future do an optional view_room-esque thing before attemping a join which would be less fragile than dispatching things in the right order.

Also, make sure the store indicates that it is not loading when a room ID has been used - no alias resolution need take place.
2017-06-02 09:22:48 +01:00
dtygel
e18437378b Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (805 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 05:36:38 +00:00
Michael Telatynski
5e2e550bf9 don't lose date seperator when the first event of the new day is redacted
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:23:07 +01:00
RiotTranslate
a2b082f029 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 02:56:55 +00:00
Krombel
b753563a7e Translated using Weblate (German)
Currently translated at 97.6% (778 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 02:56:54 +00:00
jx tsai
a8acffa8e1 Translated using Weblate (Chinese (Traditional))
Currently translated at 38.8% (310 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-06-02 02:56:54 +00:00
dtygel
364e7d6ae9 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (797 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 02:56:52 +00:00
Matthew Hodgson
adf8ce9ca1 Merge pull request #1002 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 01:09:11 +01:00
Matthew Hodgson
ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings
webrtc config electron
2017-06-02 00:48:25 +01:00
Michael Telatynski
b1973d7998 undefined =/= ''
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:42:19 +01:00
Michael Telatynski
f4db83a031 try empty string as falsey key
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:31:43 +01:00
Michael Telatynski
6b4daf02a9 i18 missed things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Michael Telatynski
4976cbb424 missed a thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:21:34 +01:00
Matthew Hodgson
c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Michael Telatynski
46a9326607 special case default - CallMediaHandler can figure it out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:20:34 +01:00
Matthew Hodgson
6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Matthew Hodgson
b411c8f97e shorten signin label to aid fr i18n 2017-06-02 00:10:54 +01:00
Michael Telatynski
3eb519b227 this is just endless
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:54:17 +01:00
Michael Telatynski
beedeec163 copy the arrays so we're not making a mess
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:50:14 +01:00
Michael Telatynski
0f2c89d525 lets actually make things work, eh?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:39:54 +01:00
Michael Telatynski
4e36c10c38 only unshift default if there is no deviceId===default
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:33:36 +01:00
Michael Telatynski
dd4480f8c3 change device data structure to array of objects
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:26:43 +01:00
Michael Telatynski
aa90d6b097 fix **AMAZING** C&P derp
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:00:25 +01:00
Michael Telatynski
0c36778369 fix bad indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:59:37 +01:00
Michael Telatynski
dbba1dedb6 i18nize all the things and change show logic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:58:17 +01:00
Michael Telatynski
04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
2017-06-01 22:56:31 +01:00
Amandine
10095af4d9 Translated using Weblate (French)
Currently translated at 100.0% (797 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-01 21:48:02 +00:00
RiotTranslate
0fa902c21d Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 21:07:12 +00:00
Bamstam
0b6d20a62e Translated using Weblate (German)
Currently translated at 99.6% (778 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 21:07:10 +00:00
Matthew Hodgson
650d45466c fix up missing strings caused by punctuation changes 2017-06-01 22:06:02 +01:00
Matthew Hodgson
ee965a89a7 Merge pull request #986 from uhoreg/compact
enable useCompactLayout user setting an add a class when it's enabled
2017-06-01 21:32:54 +01:00
Matthew Hodgson
be3ac354ed Merge pull request #987 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-01 21:24:40 +01:00
Matthew Hodgson
6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset
Translation fixes for everything but src/components
2017-06-01 21:22:00 +01:00
Marcel
8c2728ffc5 Revert changes of the key used 2017-06-01 21:10:58 +02:00
Marcel
924a8d1be0 Fix line change that should not happen 2017-06-01 21:03:43 +02:00
Marcel
51131ef7a5 Fix translation tests part 2 2017-06-01 21:02:40 +02:00
Marcel
cbf967a86d Fix tests
We do not have a en.json but a en_EN.json
2017-06-01 20:53:59 +02:00
Matthew Hodgson
8e34b59d32 Revert "Revert "add labels to language picker"" 2017-06-01 19:46:25 +01:00
Matthew Hodgson
33214b8752 Merge pull request #991 from turt2live/travis/date-sep-12hr
Support 12hr time on DateSeparator
2017-06-01 18:26:13 +01:00
RiotTranslate
989e994abc Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 17:10:28 +00:00
Bamstam
3ffa3d82c6 Translated using Weblate (German)
Currently translated at 99.6% (778 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 17:10:27 +00:00
Amandine
a2b931ee91 Translated using Weblate (French)
Currently translated at 100.0% (781 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-01 17:10:25 +00:00
Luke Barnard
16c4c14a16 Fix to show the correct room 2017-06-01 18:01:30 +01:00
Richard van der Hoff
b3e9716126 Revert "add labels to language picker" 2017-06-01 17:52:25 +01:00
Richard van der Hoff
53ebc8d7bd Merge pull request #983 from matrix-org/rav/clear_storage_on_logout
Call MatrixClient.clearStores on logout
2017-06-01 17:34:21 +01:00
Kegan Dougal
66bce35918 copyright adjustments 2017-06-01 17:29:40 +01:00
turt2live
ab1e277f5f Support 12hr time on DateSeparator
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-01 09:53:24 -06:00
Jean GB
312109e846 Translated using Weblate (French)
Currently translated at 98.7% (771 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-01 15:18:38 +00:00
Kegan Dougal
0c7040e190 Missed one 2017-06-01 16:08:42 +01:00
Kegan Dougal
ced68f2719 Find a way to translate the name of RTE in user settings
I never said it was a *nice* way...
2017-06-01 15:53:08 +01:00
Kegan Dougal
a0c21854a9 Make it compile 2017-06-01 15:45:31 +01:00
Kegan Dougal
547f10bcbb Add translations for slash command failures 2017-06-01 15:44:56 +01:00
RiotTranslate
6c48279665 Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 14:31:50 +00:00
Jean GB
e266edf350 Translated using Weblate (French)
Currently translated at 99.1% (771 of 778 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-01 14:31:50 +00:00
Krombel
5300aa40f9 Translated using Weblate (German)
Currently translated at 100.0% (778 of 778 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 14:31:48 +00:00
Kegan Dougal
f75e714c3a More translations.. 2017-06-01 15:18:06 +01:00
Matthew Hodgson
ecbc724a3f Merge pull request #988 from matrix-org/matthew/room-avatar-event
Matthew/room avatar event
2017-06-01 14:43:29 +01:00
Matthew Hodgson
e6cf93e237 switch to imports 2017-06-01 14:42:44 +01:00
Matthew Hodgson
01cdc7ff21 remove rogue import 2017-06-01 14:42:38 +01:00
daniel tygel
b8e26ddf3d add labels to language picker 2017-06-01 09:48:36 -03:00
Matthew Hodgson
00750b4686 quick and dirty RoomAvatarEvent 2017-06-01 13:31:24 +01:00
Matthew Hodgson
d689d4e1fa quick and dirty RoomAvatarEvent 2017-06-01 13:31:15 +01:00
RiotTranslate
8880207d36 [WEBLATE] fix fr and de merge issue 2017-06-01 12:28:16 +00:00
Kegan Dougal
b26f4ba578 First lot of translations 2017-06-01 12:09:07 +01:00
Krombel
84fa154016 Translated using Weblate (German)
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/de/
2017-06-01 11:06:12 +00:00
Amandine
63c9ec7d53 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-06-01 10:34:03 +00:00
Luke Barnard
dd48b3f055 Add comment 2017-06-01 10:08:02 +01:00
Richard van der Hoff
98c4252840 Throw errors when components don't look like components (#980)
- instead of mysteriously throwing an error later on.
2017-06-01 09:26:35 +01:00
Hubert Chathi
92d1a9a6ff enable useCompactLayout user setting an add a class when it's enabled
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-05-31 22:00:30 -04:00
Matthew Hodgson
d021598380 fix typo 2017-06-01 02:04:43 +01:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
5e3af22c5d fix broken i18n variable 2017-06-01 01:18:46 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
RiotTranslate
ad0cbdd4ff Update from Weblate. (#981)
* 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/

* 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/

* 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/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/

* 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/

* Translated using Weblate (German)

Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 00:39:21 +01:00
Matthew Hodgson
cad2f643ea Merge pull request #982 from turt2live/travis/presence-undefined
Fix rare case where presence duration is undefined
2017-06-01 00:38:50 +01:00
Matthew Hodgson
a33b60d3a1 Merge pull request #985 from matrix-org/t3chguy/electron_flash
add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
2017-06-01 00:08:46 +01:00
Michael Telatynski
8cfa3bc235 add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-31 23:49:55 +01:00
RiotTranslate
8ec4092074 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 18:58:42 +00:00
Bamstam
7af2f615bd Translated using Weblate (German)
Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 18:58:42 +00:00
Amandine
30dc5f8117 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 18:58:41 +00:00
Iru Cai (vimacs)
f2db6dd168 Translated using Weblate (Chinese (Simplified))
Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-05-31 18:58:41 +00:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
Richard van der Hoff
cbbed3f544 Fixes to i18n code 2017-05-31 18:31:10 +01:00
Richard van der Hoff
c3d37c1ff9 Call MatrixClient.clearStores on logout
... to make sure that we don't have any sensitive data sitting around in the
stores.
2017-05-31 18:28:21 +01:00
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
Luke Barnard
8192374481 Add missing _t import 2017-05-31 16:02:42 +01:00
Luke Barnard
7abaadddde Merge pull request #977 from matrix-org/luke/session-store-null-on-logout
Remove cachedPassword from localStorage on_logged_out
2017-05-31 16:00:24 +01:00
Luke Barnard
b3a862c2c2 Remove redundant reset 2017-05-31 15:32:55 +01:00
Luke Barnard
d0e270bd1c Only re-render LoggedInView if MatrixClientPeg.get() is truthy 2017-05-31 15:15:27 +01: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
d83f18ab46 Remove cachedPassword from localStorage on_logged_out
Fixes https://github.com/vector-im/riot-web/issues/4101
2017-05-31 10:03:16 +01: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
Matthew Hodgson
c15568e003 remove spurious string 2017-05-30 21:05:26 +01:00
Matthew Hodgson
e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01: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