PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
4596 commits 1 branch 0 tags 338 MiB
Commit graph

4596 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthew Hodgson
7f4bdd4b38 Merge pull request #974 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-05-31 00:39:11 +01: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
Matthew Hodgson
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
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
055386d63e Merge pull request #973 from MTRNord/patch-1 
Fix missing string in the room settings
 2017-05-30 20:54:51 +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
797695dc8a Merge pull request #972 from coletivoEITA/develop 
fix error in i18n string
 2017-05-30 20:40:43 +01:00
Matthew Hodgson
507f62a8d4 Merge branch 'develop' into develop 2017-05-30 20:40:35 +01:00
Matthew Hodgson
48a2ad93da fix {integrationsUrl} thinko 2017-05-30 20:32:12 +01:00
daniel tygel
5a4ec1996d fix error in i18n string 2017-05-30 16:29:50 -03: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
Matthew Hodgson
a9d2a950a8 Merge pull request #971 from turt2live/travis/12hr-hotfixes 
Support 12hr time in full date
 2017-05-30 20:15:39 +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
bf406bfcf6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 17:10:00 +00: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
Matthew Hodgson
9975514850 Merge pull request #969 from turt2live/travis/12h-ts-collision 
Remove space between time and AM/PM
 2017-05-30 17:23:04 +01: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