Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.

2019-04-10 09:16:08 +02:00

..

locale-data

[i18n] update and corrections for Occitan locale (#9404)

2018-12-01 17:39:13 +01:00

ar.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ast.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

bg.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

bn.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ca.json

i18n: update Catalan translation (#10458)

2019-04-04 10:25:20 +09:00

co.json

i18n: Update Corsican translations (#10504)

2019-04-08 21:12:06 +09:00

cs.json

i18n: Update Czech translation (#10506)

2019-04-08 21:11:39 +09:00

cy.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

da.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

de.json

Updated German locales (#10505)

2019-04-08 21:14:08 +09:00

defaultMessages.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

el.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

en.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

eo.json

Esperanto translations (#10461)

2019-04-03 18:19:10 +09:00

es.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

eu.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

fa.json

l10n update: fa (#10417)

2019-03-29 22:04:55 +09:00

fi.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

fr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

gl.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

he.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hu.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

hy.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

id.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

index.js

…

io.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

it.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ja.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

ka.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

kk.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ko.json

Translate Korean (#10499)

2019-04-08 12:35:37 +09:00

lv.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ms.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

nl.json

Dutch (nl) translation (#10474)

2019-04-05 06:12:08 +09:00

no.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

oc.json

[i18n] Update and correction (#10511)

2019-04-09 07:39:50 +09:00

pl.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

pt-BR.json

Re-dd PT-br translations (#10459)

2019-04-03 07:24:39 +09:00

pt.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ro.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ru.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sk.json

Improve sk translation further (#10484)

2019-04-06 23:26:51 +09:00

sl.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sq.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sr-Latn.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sr.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

sv.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

ta.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

te.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

th.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

tr.json

Fixed terrible grammar and translated the most (#10527)

2019-04-09 20:42:01 +02:00

uk.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

whitelist_ar.json

…

whitelist_ast.json

…

whitelist_bg.json

…

whitelist_bn.json

Weblate translations (2019-03-24) (#10362)

2019-03-24 18:44:59 +01:00

whitelist_ca.json

…

whitelist_co.json

…

whitelist_cs.json

…

whitelist_cy.json

…

whitelist_da.json

…

whitelist_de.json

…

whitelist_el.json

…

whitelist_en.json

…

whitelist_eo.json

…

whitelist_es.json

…

whitelist_eu.json

…

whitelist_fa.json

…

whitelist_fi.json

…

whitelist_fr.json

…

whitelist_gl.json

…

whitelist_he.json

…

whitelist_hr.json

…

whitelist_hu.json

…

whitelist_hy.json

…

whitelist_id.json

…

whitelist_io.json

…

whitelist_it.json

…

whitelist_ja.json

…

whitelist_ka.json

…

whitelist_kk.json

Weblate translations (2019-02-23) (#10103)

2019-02-23 18:41:28 +01:00

whitelist_ko.json

…

whitelist_lv.json

Weblate translations (2019-01-08) (#9758)

2019-01-08 14:09:57 +01:00

whitelist_ms.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

whitelist_nl.json

…

whitelist_no.json

…

whitelist_oc.json

…

whitelist_pl.json

…

whitelist_pt-BR.json

…

whitelist_pt.json

…

whitelist_ro.json

…

whitelist_ru.json

…

whitelist_sk.json

…

whitelist_sl.json

…

whitelist_sq.json

Weblate translations (2019-02-11) (#10007)

2019-02-11 07:41:35 +01:00

whitelist_sr-Latn.json

…

whitelist_sr.json

…

whitelist_sv.json

…

whitelist_ta.json

…

whitelist_te.json

…

whitelist_th.json

…

whitelist_tr.json

…

whitelist_uk.json

…

whitelist_zh-CN.json

…

whitelist_zh-HK.json

…

whitelist_zh-TW.json

…

zh-CN.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

zh-HK.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00

zh-TW.json

Revert locales touched by automated translations (#10399)

2019-03-28 00:30:47 +01:00