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/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/ja.yml')
| -rw-r--r-- | config/locales/ja.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 99fd5dd7b..9adf0c7fa 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -261,6 +261,11 @@ ja: expired: 期限切れ title: フィルター title: 招待 + relays: + add_new: リレーを追加 + inbox_url: Relay URL + status: ステータス + title: リレー report_notes: created_msg: レポートメモを書き込みました！ destroyed_msg: レポートメモを削除しました！ @@ -706,7 +711,7 @@ ja: disallowed_hashtags: one: '許可されていないハッシュタグが含まれています: %{tags}' other: '許可されていないハッシュタグが含まれています: %{tags}' - language_detection: 自動的に言語を検出する + language_detection: 自動検出 open_in_web: Webで開く over_character_limit: 上限は %{max}文字までです pin_errors: |