diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
| commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
| tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /config/locales/doorkeeper.ja.yml | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) | |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/doorkeeper.ja.yml')
| -rw-r--r-- | config/locales/doorkeeper.ja.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml index 76174ef79..9bc2d9a80 100644 --- a/config/locales/doorkeeper.ja.yml +++ b/config/locales/doorkeeper.ja.yml @@ -133,7 +133,7 @@ ja: write:blocks: ユーザーのブロックやドメインの非表示 write:favourites: トゥートのお気に入り登録 write:filters: フィルターの変更 - write:follows: フォローの変更 + write:follows: あなたの代わりにフォロー、アンフォロー write:lists: リストの変更 write:media: メディアのアップロード write:mutes: アカウントや会話のミュート |