Commit Graph

35 Commits

Author SHA1 Message Date
Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
2017-06-22 15:04:33 +01:00
Richard van der Hoff a9c8429d2e Merge pull request #4362 from turt2live/travis/missed-redact
Change missed 'Redact' to 'Remove' in ImageView.
2017-06-22 14:37:31 +01:00
David Baker 8f8b28425d Fix json fail 2017-06-20 15:55:35 +01:00
Michael Telatynski fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00
Luke Barnard 047b255e14 Add en_EN translations 2017-06-20 13:33:38 +01:00
turt2live 4ae6e9fdfd Remove 'Redact' from en_US and en_EN as it is no longer needed
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:31:59 -06:00
Matthew Hodgson 6b1ffaff7a fix broken http status i18n 2017-06-18 23:54:29 +01:00
Luke Barnard c8416b0321 i18n for setting email after password flow 2017-06-13 18:31:35 +01:00
Michael Telatynski 53e2ce33b8 remove unused i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 13:39:35 +01:00
Michael Telatynski a32ce4fbf6 remove unused string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:57:03 +01:00
Michael Telatynski deb7ed660c Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-11 23:13:49 +01:00
Michael Telatynski a520f0bfed move all logic, make bar more generic
pass through actual errors
and tidy
needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:19:17 +01:00
Matthew Hodgson 919ca5d67c fix missing string and broken var 2017-06-08 22:48:12 +01:00
Matthew Hodgson da69d03b1d i18n powered by [matrix] sanely 2017-06-08 13:50:53 +01:00
Matthew Hodgson 96e3c43570 tweak welcome page text 2017-06-07 18:48:24 +01:00
David Baker e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
Luke Barnard 0919b7ce3a i18n for SetPasswordDialog 2017-06-05 16:13:44 +01:00
Michael Telatynski f5ba6fa952 i18n things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d878c72)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:33 +01:00
David Baker 4f0fee2cd1 Add missing translation for room directory
Also remove newline in translation string.
2017-06-02 17:02:17 +01:00
Matthew Hodgson e921a0714f missing string 2017-06-01 22:08:17 +01:00
Matthew Hodgson 292b50f1ac fix myriad bugs in i18n files 2017-06-01 00:51:56 +01:00
Matthew Hodgson aa5587ba95 Merge branch 'develop' into kegan/translation-macaque 2017-06-01 00:36:37 +01:00
Matthew Hodgson a21c77f4dd make it work 2017-06-01 00:07:47 +01:00
Kegan Dougal a7659a57a8 Add remaining translations 2017-05-31 16:56:50 +01:00
Kegan Dougal 1dce9cda9e Translate src/components/views/globals
directory and elements already done
2017-05-31 16:02:59 +01:00
Kegan Dougal 162f3872e5 Translate src/components/context_menus|dialogs 2017-05-31 15:40:49 +01:00
Kegan Dougal fd5e7ff37a Translate src/vector 2017-05-31 15:06:03 +01:00
Kegan Dougal 52ddcd8a60 Translate src/vector/platform 2017-05-31 14:51:08 +01:00
Matthew Hodgson 64a67583e0 Merge pull request #4038 from vector-im/tom-welcome-page
Tom welcome page
2017-05-30 21:36:21 +01:00
Kegan Dougal 2a122a25fa Translate notification strings 2017-05-30 17:39:41 +01:00
Kegan Dougal 1b4444cc73 Add missing translations 2017-05-30 16:30:56 +01:00
Kegan Dougal 7e21e00c99 Translate src/components/structures 2017-05-30 16:27:48 +01:00
Matthew Hodgson 37b51b8a2a translate login button 2017-05-30 12:25:27 +01:00
Matthew Hodgson 4293273e55 fix a bunch of i18n fails picked up by check-i18n.pl 2017-05-27 19:26:19 +01:00
David Baker 6c3c4fc547 Language generation and file structure
* Move language files to strings/ subdir to be consistent with
   react-sdk
 * Only copy static list of languages (to avoid including
   languages that are only a few percent translated)
 * Make copy-res script work with watch mode
 * Other general cleanups like only write each language file once,
   rather than n times.
2017-05-26 16:48:21 +01:00