Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-03-04 06:44:49 +01:00
commit b7f6817005
5 changed files with 7 additions and 3 deletions

View File

@ -18,7 +18,8 @@
### Translation changes ### Translation changes
- Updated German, Bulgarian, Russian, Chinese (traditional), Norwegian Bokmål and French translations. - New locale: Bulgarian
- Updated German, Russian, Chinese (traditional), Norwegian Bokmål and French translations.
## 3.3.3 (2018-02-14) ## 3.3.3 (2018-02-14)

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -308,9 +308,9 @@
keepalive: true, keepalive: true,
locales_url: 'locale/{{{locale}}}/LC_MESSAGES/converse.json', locales_url: 'locale/{{{locale}}}/LC_MESSAGES/converse.json',
locales: [ locales: [
'af', 'ca', 'de', 'es', 'en', 'fr', 'he', 'af', 'bg', 'ca', 'de', 'es', 'en', 'fr', 'he',
'hu', 'id', 'it', 'ja', 'nb', 'nl', 'hu', 'id', 'it', 'ja', 'nb', 'nl',
'pl', 'pt_BR', 'ru', 'uk', 'zh_CN', 'zh_TW' 'pl', 'pt_BR', 'ru', 'tr', 'uk', 'zh_CN', 'zh_TW'
], ],
message_carbons: true, message_carbons: true,
message_storage: 'session', message_storage: 'session',

View File

@ -15,6 +15,7 @@
"lodash.noconflict", "lodash.noconflict",
"moment", "moment",
'moment/locale/af', 'moment/locale/af',
'moment/locale/bg',
'moment/locale/ca', 'moment/locale/ca',
'moment/locale/de', 'moment/locale/de',
'moment/locale/es', 'moment/locale/es',