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/io.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/io.yml')
| -rw-r--r-- | config/locales/io.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/io.yml b/config/locales/io.yml index 4360d804e..c6e39ea2a 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -102,8 +102,8 @@ io: one: Tu obtenis nova sequanto! Yey! other: Tu obtenis %{count} nova sequanti! Astonive! subject: - one: "1 nova savigo depos tua lasta vizito \U0001F418" - other: "%{count} nova savigi depos tua lasta vizito \U0001F418" + one: "1 nova savigo depos tua lasta vizito 🐘" + other: "%{count} nova savigi depos tua lasta vizito 🐘" favourite: body: "%{name} favoris tua mesajo:" subject: "%{name} favoris tua mesajo" |