diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
commit | 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 (patch) | |
tree | 09e7a5fef106da1b6ebdc53ac0df62cafc159520 /config/locales/cs.yml | |
parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
parent | f85b66eb8cc9513822d0ece3928b12aa789bb410 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Diffstat (limited to 'config/locales/cs.yml')
-rw-r--r-- | config/locales/cs.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 6e7afecf5..e455a27fd 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -37,7 +37,7 @@ cs: tagline: Sledujte své přátele a objevujte nové terms: Podmínky používání user_count_after: - few: uživatelů + few: uživatelé one: uživatel other: uživatelů user_count_before: Domov |