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/simple_form.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/simple_form.oc.yml')
-rw-r--r-- | config/locales/simple_form.oc.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 3ceed0ed4..8260d81e0 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -68,7 +68,7 @@ oc: phrase: Senhal o frasa setting_aggregate_reblogs: Agropar los partatges dins lo flux d’actualitat setting_auto_play_gif: Lectura automatica dels GIFS animats - setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut + setting_boost_modal: Mostrar una fenèstra de confirmacion abans de partejar un estatut setting_default_language: Lenga de publicacion setting_default_privacy: Confidencialitat dels tuts setting_default_sensitive: Totjorn marcar los mèdias coma sensibles |