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/io.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/io.yml')
| -rw-r--r-- | config/locales/io.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/io.yml b/config/locales/io.yml index 73c981a98..ec86d1a79 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -3,9 +3,7 @@ io: about: about_mastodon_html: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate. about_this: Pri ta instaluro - closed_registrations: Membresko ne nun esas posible en ta instaluro. contact: Kontaktar - other_instances: Altra instaluri source_code: Fontkodexo status_count_after: mesaji status_count_before: Qua publikigis |