diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /config/locales/pl.yml | |
parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to 'config/locales/pl.yml')
-rw-r--r-- | config/locales/pl.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/pl.yml b/config/locales/pl.yml index f4c47fea2..c7c74b239 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -410,6 +410,7 @@ pl: media: title: Media no_media: Bez zawartości multimedialnej + no_status_selected: Żaden wpis nie został zmieniony, bo żaden nie został wybrany title: Wpisy konta with_media: Z zawartością multimedialną subscriptions: |