diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-13 15:16:02 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-13 15:16:02 +0100 |
commit | 02062aab55cb6f8da527998a210775c2ad695eed (patch) | |
tree | ab606ee84d964f28dad5bc77cfbd49b5c12849fa /config/locales/ast.yml | |
parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
parent | 06663fcf87fe0d6bc71336e6f212b82f098066d7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'config/locales/ast.yml')
-rw-r--r-- | config/locales/ast.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 78ad796a0..ebf6a3799 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -12,12 +12,6 @@ ast: extended_description_html: | <h3>Un llugar bonu pa les regles</h3> <p>Entá nun se configuró la descripción estendida.</p> - features: - humane_approach_title: Una visión más humana - not_a_product_body: Mastodon nun ye una rede comercial, nun hai anuncios, nun recueye datos o nun pon muries a xardinos. Nin siquier tien una autoridá central. - not_a_product_title: Yes una persona, non un productu - real_conversation_title: Fechu pa conversaciones de verdá - within_reach_title: Siempres al algame hosted_on: Mastodon ta agospiáu en %{domain} learn_more: Deprendi más source_code: Códigu fonte @@ -141,7 +135,6 @@ ast: cas: CAS saml: SAML register: Rexistrase - register_elsewhere: Rexistrase n'otru sirvidor security: Seguranza authorize_follow: already_following: Yá tas siguiendo a esta cuenta |