diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/simple_form.eu.yml | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/simple_form.eu.yml')
-rw-r--r-- | config/locales/simple_form.eu.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index d856feac5..22b71bac1 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -28,5 +28,14 @@ eu: filtered_languages: Iragazitako hizkuntzak locale: Hizkuntza new_password: Pasahitz berria - note: Bio + note: Biografia password: Pasahitza + setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik + setting_default_privacy: Mezuaren pribatutasuna + notification_emails: + reblog: Bidali e-mail mezua norbaitek zure mezuari bultzada ematen badio + 'no': Ez + required: + mark: "*" + text: beharrezkoa + 'yes': Bai |