about summary refs log tree commit diff
path: root/config/locales/pl.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-06-21 20:49:57 +0200
committerThibaut Girka <thib@sitedethib.com>2018-06-21 20:49:57 +0200
commitab5f450700085ce73621b28b813f2edc5f199785 (patch)
tree766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/pl.yml
parent26c20a4ec7868753b284670575f28f201a5cef9f (diff)
parent7f59206944193591d7aef5cbd73edc7f5303add7 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/pl.yml')
-rw-r--r--config/locales/pl.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 15f9cc7dd..c6af05137 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -518,6 +518,7 @@ pl:
       '86400': dobie
     expires_in_prompt: Nigdy
     generate: Wygeneruj
+    invited_by: 'Zostałeś zaproszony przez:'
     max_uses:
       few: "%{count} użycia"
       many: "%{count} użyć"
@@ -698,6 +699,7 @@ pl:
     disallowed_hashtags:
       one: 'zawiera niedozwolony hashtag: %{tags}'
       other: 'zawiera niedozwolone hashtagi: %{tags}'
+    language_detection: Automatycznie wykrywaj język
     open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
     pin_errors: