diff options
author | ThibG <thib@sitedethib.com> | 2018-10-02 12:01:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 12:01:40 +0200 |
commit | 35e9d099b3febd75d1613dfc8a494e769a98c3a6 (patch) | |
tree | 2aceaee757bd292e3d05811673a7bfe419e7b064 /config/locales/simple_form.eu.yml | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 6ad76069096005d7b55d9c63a567f843997a8068 (diff) |
Merge pull request #758 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.eu.yml')
-rw-r--r-- | config/locales/simple_form.eu.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 1e3b2d4f0..7fa8319ae 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -69,7 +69,6 @@ eu: setting_default_privacy: Mezuen pribatutasuna setting_default_sensitive: Beti markatu edukiak hunkigarri gisa setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik - setting_display_sensitive_media: Beti erakutsi hunkigarri gisa markatutako edukia setting_hide_network: Ezkutatu zure sarea setting_noindex: Atera bilaketa motorraren indexaziotik setting_reduce_motion: Murriztu animazioen mugimenduak |