diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
| commit | eee36267d627ae08898d2b3301f56ce729055e82 (patch) | |
| tree | dae581a9867b8dcdd2c3ab0154794a1ff10ad98e /app/javascript/flavours/glitch/locales | |
| parent | 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960 (diff) | |
| parent | ac9fb0d654440ce1179bab4071941450aa994d2c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
Diffstat (limited to 'app/javascript/flavours/glitch/locales')
| -rw-r--r-- | app/javascript/flavours/glitch/locales/ja.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/locales/ja.js b/app/javascript/flavours/glitch/locales/ja.js index 0ca5e5fc7..52aeed3d6 100644 --- a/app/javascript/flavours/glitch/locales/ja.js +++ b/app/javascript/flavours/glitch/locales/ja.js @@ -8,6 +8,7 @@ const messages = { 'layout.single': 'モバイル', 'navigation_bar.app_settings': 'アプリ設定', 'navigation_bar.featured_users': '紹介しているアカウント', + 'navigation_bar.misc': 'その他', 'getting_started.onboarding': '解説を表示', 'onboarding.page_one.federation': '{domain}はMastodonのインスタンスです。Mastodonとは、独立したサーバが連携して作るソーシャルネットワークです。これらのサーバーをインスタンスと呼びます。', 'onboarding.page_one.welcome': '{domain}へようこそ！', |