diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
commit | 4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch) | |
tree | 7c90513d2576dba9d71ac069ca28ac7e4db72a28 /config/locales/ja.yml | |
parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
parent | 735b8be2042a29fb10077aaab526832b95a041a9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.
Diffstat (limited to 'config/locales/ja.yml')
-rw-r--r-- | config/locales/ja.yml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/config/locales/ja.yml b/config/locales/ja.yml index e22359a32..0c5631d3d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -139,7 +139,7 @@ ja: protocol: プロトコル public: パブリック push_subscription_expires: PuSH購読期限 - redownload: アバターの更新 + redownload: プロフィールを更新 remove_avatar: アイコンを削除 remove_header: ヘッダーを削除 resend_confirmation: @@ -722,14 +722,9 @@ ja: truncate: "…" polls: errors: - already_voted: You have already voted on this poll - duplicate_options: contain duplicate items - duration_too_long: is too far into the future - duration_too_short: is too soon - expired: The poll has already ended - over_character_limit: cannot be longer than %{max} characters each - too_few_options: must have more than one item - too_many_options: can't contain more than %{max} items + duplicate_options: 項目が重複しています + duration_too_short: 期限が短すぎます + expired: 既に終了している投票です preferences: languages: 言語 other: その他 @@ -835,7 +830,7 @@ ja: open_in_web: Webで開く over_character_limit: 上限は %{max}文字までです pin_errors: - limit: 固定されているトゥートの上限に達しました + limit: 固定できるトゥート数の上限に達しました ownership: 他人のトゥートを固定することはできません private: 非公開のトゥートを固定することはできません reblog: ブーストされたトゥートを固定することはできません |