8880207d36
[WEBLATE] fix fr and de merge issue
2017-06-01 12:28:16 +00:00
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
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
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
b1475cb309
bump js-sdk
2017-06-01 02:04:46 +01:00
d021598380
fix typo
2017-06-01 02:04:43 +01:00
3d91b31637
i18n invited, and delete stale warning
2017-06-01 01:29:07 +01:00
5e3af22c5d
fix broken i18n variable
2017-06-01 01:18:46 +01:00
b4284cf000
fix up Can't connect to HS i18n with _tJsx
2017-06-01 01:17:39 +01:00
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
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
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
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
8ec4092074
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 18:58:42 +00:00
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
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
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
165dfeccb9
Fix rare case where presence duration is undefined & i18n
2017-05-31 11:56:04 -06:00
92143f2dc2
Merge pull request #984 from matrix-org/rav/i18n_fixes
...
Fixes to i18n code
2017-05-31 18:35:46 +01:00
cbbed3f544
Fixes to i18n code
2017-05-31 18:31:10 +01:00
4bc252a16b
delint src/Lifecycle
2017-05-31 17:28:08 +01:00
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
ccbfdcc661
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 15:15:41 +00:00
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
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
2d73f094ff
Delint MatrixChat, again ( #979 )
...
grrr.
2017-05-31 15:09:09 +01:00
861cae8779
Merge pull request #978 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-31 14:12:38 +01:00
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
0f32923427
Merge pull request #975 from coletivoEITA/develop
...
Added two strings to translate
2017-05-31 14:08:49 +01:00
75d2b2319d
translate directly in pt_BR.json
2017-05-31 09:10:19 -03:00
d4a89cc2df
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-05-31 09:09:27 -03:00
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
b5194cfc80
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 09:55:58 +00:00
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
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
532198dd10
Merge pull request #976 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-31 09:55:23 +01:00
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
7ef4257bc1
Merge remote-tracking branch 'origin/develop' into develop
2017-05-31 04:16:25 +00:00
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
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
7f4bdd4b38
Merge pull request #974 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-31 00:39:11 +01:00
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
549875ba0a
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 23:22:31 +00:00
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
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
3942dbcaff
Merge pull request #920 from matrix-org/t3chguy/electron_settings
...
Initial Electron Settings - for Auto Launch
2017-05-30 23:59:24 +01:00
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
0d930c0553
change wording and i18n it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:46:51 +01:00
f4e5039e70
add string to translate
2017-05-30 19:01:23 -03:00
12f923bc81
add new string to translate
2017-05-30 18:56:52 -03:00
RiotTranslate