diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
| commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
| tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/devise.hu.yml | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/devise.hu.yml')
| -rw-r--r-- | config/locales/devise.hu.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml index 7b1aa3874..a60d2e88b 100644 --- a/config/locales/devise.hu.yml +++ b/config/locales/devise.hu.yml @@ -111,5 +111,5 @@ hu: not_found: nem található not_locked: nincs lezárva not_saved: - one: '1 hiba megakadályozta %{resource} mentését:' - other: "%{count} számú hiba megakadályozta %{resource} mentését:" + one: '1 hiba megakadályozta e %{resource} mentését:' + other: "%{count} hiba megakadályozta e %{resource} mentését:" |