diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
commit | ab5ff638f2968e3f434e504c7caab370bf71c9c0 (patch) | |
tree | 172f2c2fc8192688b960dd2bd42ea126ad9245fb /config/locales/sr-Latn.yml | |
parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
parent | 902c6bed5aab12c2e97af3452f122247777226af (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
Diffstat (limited to 'config/locales/sr-Latn.yml')
-rw-r--r-- | config/locales/sr-Latn.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 2bddaf311..1f3d69e21 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -47,9 +47,7 @@ sr-Latn: email_status: Status e-pošte enable: Uključi enabled: Uključeno - feed_url: Adresa dovoda followers: Pratioci - followers_url: Adresa pratioca follows: Praćeni inbox_url: Adresa sandučeta location: @@ -69,9 +67,7 @@ sr-Latn: most_recent_activity: Najskorija aktivnost most_recent_ip: Najskorija IP adresa not_subscribed: Nije pretplaćen - outbox_url: Odlazno sanduče perform_full_suspension: Izvrši kompletno isključenje - profile_url: Adresa profila promote: Unapredi protocol: Protokol public: Javno @@ -87,7 +83,6 @@ sr-Latn: roles: staff: Osoblje user: Korisnik - salmon_url: Salmon adresa search: Pretraga shared_inbox_url: Adresa deljenog sandučeta show: |