Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00
parent ad46bc9772 51f2eca887
commit 933eafdcd3
14 changed files with 102 additions and 25 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -232,6 +232,11 @@ en:
      search: Search
      title: Known instances
    invites:
+      filter:
+        all: All
+        available: Available
+        expired: Expired
+        title: Filter
      title: Invites
    reports:
      action_taken_by: Action taken by
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -232,6 +232,11 @@ ja:
      search: 検索
      title: 既知のインスタンス
    invites:
+      filter:
+        all: すべて
+        available: 使用可能
+        expired: 期限切れ
+        title: フィルター
      title: 招待
    reports:
      action_taken_by: レポート処理者
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -232,6 +232,13 @@ pl:
      reset: Przywróć
      search: Szukaj
      title: Znane instancje
+    invites:
+      filter:
+        all: Wszystkie
+        available: Dostępne
+        expired: Wygasłe
+        title: Filtruj
+      title: Zaproszenia
    reports:
      action_taken_by: Działanie podjęte przez
      are_you_sure: Czy na pewno?