diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
| commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
| tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /config/locales/doorkeeper.ja.yml | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
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: アカウントや会話のミュート |