diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-31 22:21:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 00:18:13 +0200 |
| commit | c1c514ca703f3e11adfe41734345b5277e886c50 (patch) | |
| tree | d8e088898292ca6da0f979b9244781b2ce116c7e /config/locales/hr.yml | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
Diffstat (limited to 'config/locales/hr.yml')
| -rw-r--r-- | config/locales/hr.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 2d2eddc08..07373d19d 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -22,7 +22,6 @@ hr: people_followed_by: Ljudi koje %{name} slijedi people_who_follow: Ljudi koji slijede %{name} posts: Postovi - remote_follow: Remote follow unfollow: Prestani slijediti application_mailer: settings: 'Promijeni e-mail postavke: %{link}' @@ -64,7 +63,6 @@ hr: storage: Pohrana media zapisa generic: changes_saved_msg: Izmjene su uspješno sačuvane! - powered_by: omogućuje %{link} save_changes: Sačuvaj izmjene validation_errors: one: Nešto ne štima! Vidi grešku ispod @@ -77,8 +75,6 @@ hr: following: Lista onih koje slijedim muting: Lista utišanih upload: Upload - landing_strip_html: "<strong>%{name}</strong> je korisnik na %{link_to_root_path}. Možeš ih slijediti ili komunicirati s njima ako imaš račun igdje u fediversu." - landing_strip_signup_html: Ako nemaš, možeš se <a href="%{sign_up_path}">registrirati ovdje</a>. notification_mailer: digest: body: 'Ovo je kratak sažetak propuštenog %{instance} od tvog prošlog posjeta %{since}:' @@ -141,7 +137,6 @@ hr: public: Javno unlisted: Javno, no nemoj prikazati na javnom timelineu stream_entries: - click_to_show: Klikni da bi prikazao reblogged: potaknut sensitive_content: Osjetljivi sadržaj time: |