diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
| commit | 16ff7c5627c12a0c9658e9d2fac7c48002e1b788 (patch) | |
| tree | 465a73fb9f42bc2b01127b2d477b0715fb6185b4 /config/locales/sr-Latn.yml | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
| parent | 3babf8464b0903b854ec16d355909444ef3ca0bc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
Diffstat (limited to 'config/locales/sr-Latn.yml')
| -rw-r--r-- | config/locales/sr-Latn.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 5c06242cc..44bae34d0 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -6,9 +6,6 @@ sr-Latn: about_this: O instanci contact: Kontakt contact_missing: Nije postavljeno - extended_description_html: | - <h3>Dobro mesto za pravila</h3> - <p>Prošireni opis koji još nije postavljen.</p> generic_description: "%{domain} je server na mreži" hosted_on: Mastodont hostovan na %{domain} learn_more: Saznajte više @@ -381,9 +378,6 @@ sr-Latn: too_many: Ne može se prikačiti više od 4 fajla migrations: acct: korisnik@domen novog naloga - currently_redirecting: 'Profil Vam je podešen da preusmerava na :' - proceed: Sačuvaj - updated_msg: Prebacivanje postavki Vašeg naloga uspešno izmenjeno! moderation: title: Moderacija notification_mailer: |