diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /config/locales/oc.yml | |
parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'config/locales/oc.yml')
-rw-r--r-- | config/locales/oc.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index bf5d420f6..707877542 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -104,6 +104,7 @@ oc: followers: Seguidors followers_url: URL dels seguidors follows: Abonaments + header: Bandièra inbox_url: URL de recepcion ip: IP location: @@ -134,6 +135,7 @@ oc: push_subscription_expires: Fin de l’abonament PuSH redownload: Actualizar los avatars remove_avatar: Supriir l’avatar + remove_header: Levar la bandièra resend_confirmation: already_confirmed: Aqueste utilizaire es ja confirmat send: Tornar mandar lo corrièl de confirmacion @@ -152,7 +154,6 @@ oc: shared_inbox_url: URL de recepcion partejada show: created_reports: Rapòrts creat per aqueste compte - report: rapòrt targeted_reports: Rapòrts faches tocant aqueste compte silence: Silenci silenced: Rescondut |