diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
| commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
| tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /config/locales/sl.yml | |
| parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
| parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'config/locales/sl.yml')
| -rw-r--r-- | config/locales/sl.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 5a4ffb6cd..3d99f7708 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -22,14 +22,14 @@ sl: status_count_after: few: stanja one: stanje - other: stanja + other: stanj two: stanja - status_count_before: Kdo je avtor + status_count_before: Ki so avtorji terms: Pogoji storitve user_count_after: few: uporabniki one: uporabnik - other: uporabniki + other: uporabnikov two: uporabniki user_count_before: Dom za what_is_mastodon: Kaj je Mastodon? |