diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
commit | ff73d43b3596d50d071fd3e6ab6f49608b62c9d1 (patch) | |
tree | bf8dca3a3864b013b0e55476a21fb1ad0d97c41f /config/locales/sr.yml | |
parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
parent | 68273a7c6d6c630b6c88764579580682e12eebce (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.
Diffstat (limited to 'config/locales/sr.yml')
-rw-r--r-- | config/locales/sr.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/sr.yml b/config/locales/sr.yml index e89e43879..e8e44a651 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -530,9 +530,9 @@ sr: one: Добили сте једног новог пратиоца! Јеее! other: Добили сте %{count} нових пратиоца! Сјајно! subject: - few: "%{count} нова обавештења од последње посете \U0001F418" - one: "1 ново обавештење од последње посете \U0001F418" - other: "%{count} нових обавештења од последње посете \U0001F418" + few: "%{count} нова обавештења од последње посете 🐘" + one: "1 ново обавештење од последње посете 🐘" + other: "%{count} нових обавештења од последње посете 🐘" title: Док нисте били ту... favourite: body: "%{name} је поставио као омиљен Ваш статус:" |