djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream 

Conflicts:
- app/views/admin/settings/edit.html.haml
  Conflict on theme VS flavour/skin handling.
  Keep our version.
This commit is contained in:
Thibaut Girka 2019-06-19 18:49:25 +02:00
parent 356e9150df e9a11dca19
commit 032a669622
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/sk.yml
View File

@ -301,7 +301,7 @@ sk:
affected_accounts:
few: "%{count} účtov v databázi ovplyvnených"
many: "%{count} účtov v databázi ovplyvnených"
one: "%{count} účet v databázi ovplyvnený"
one: Jeden účet v databázi ovplyvnený
other: "%{count} účty v databázi ovplyvnené"
retroactive:
silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény