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/hr.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/hr.yml')
| -rw-r--r-- | config/locales/hr.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 38971833c..f53515d7a 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -3,9 +3,7 @@ hr: about: about_mastodon_html: Mastodon je <em>besplatna, open-source</em> socijalna mreža. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati — koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreži</em> bez problema. about_this: O ovoj instanci - closed_registrations: Registracije na ovoj instanci su trenutno zatvorene. contact: Kontakt - other_instances: Druge instance source_code: Izvorni kod status_count_after: statusi status_count_before: Tko je autor |