From a5c46885c8ade20a674ada43cd0fc18b9a78b58c Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Sat, 7 Sep 2019 18:07:40 +0900 Subject: [PATCH 1/3] Fix & add Japanese translations --- resources/lang/ja/helpcenter.php | 2 +- resources/lang/ja/navmenu.php | 5 +++-- resources/lang/ja/site.php | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resources/lang/ja/helpcenter.php b/resources/lang/ja/helpcenter.php index b4da31f7d..98ae53a6c 100644 --- a/resources/lang/ja/helpcenter.php +++ b/resources/lang/ja/helpcenter.php @@ -10,7 +10,7 @@ return [ 'profile' => 'プロフィール', 'stories' => 'ストーリー', 'hashtags' => 'ハッシュダグ', - 'discover' => '見つける', + 'discover' => '発見', 'directMessages' => 'ダイレクトメッセージ', 'timelines' => 'タイムライン', diff --git a/resources/lang/ja/navmenu.php b/resources/lang/ja/navmenu.php index d81b076d6..5160c84a4 100644 --- a/resources/lang/ja/navmenu.php +++ b/resources/lang/ja/navmenu.php @@ -6,13 +6,14 @@ return [ 'home' => 'ホーム', 'local' => 'ローカル', 'network' => 'ネットワーク', - 'discover' => '見つける', + 'discover' => '発見', 'viewMyProfile' => '自分のプロフィールを見る', + 'myProfile' => 'プロフィール', 'myTimeline' => 'タイムライン', 'publicTimeline' => 'パブリックタイムライン', 'remoteFollow' => 'リモートフォロー', 'settings' => '設定', - 'admin' => '管理者', + 'admin' => '管理者設定', 'logout' => 'ログアウト', 'directMessages' => 'ダイレクトメッセージ', diff --git a/resources/lang/ja/site.php b/resources/lang/ja/site.php index 98d542e50..8f832da3b 100644 --- a/resources/lang/ja/site.php +++ b/resources/lang/ja/site.php @@ -3,11 +3,13 @@ return [ 'about' => 'このサーバーについて', 'help' => 'ヘルプ', 'language' => '言語', - 'fediverse' => '分散', + 'fediverse' => 'Fediverse', 'opensource' => 'オープンソース', - 'terms' => '規約', - 'privacy' => 'プライバシー', + 'terms' => '利用規約', + 'privacy' => 'プライバシーポリシー', 'l10nWip' => '私達はローカライズサポートに取り組んでいます', - 'currentLocale' => '現在のロケール', + 'currentLocale' => '現在のロケール（言語）', 'selectLocale' => 'リストの中からロケール（言語）を選択してください', + 'contact' => 'コンタクト', + 'contact-us' => 'お問い合わせ', ]; From 8b0d0879091b7a1c49a12d7e13a55b23957fd4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com> Date: Sun, 8 Sep 2019 14:46:12 +0200 Subject: [PATCH 2/3] Update navmenu lang file To translate: Commits on Aug 30, 2019 --- resources/lang/oc/navmenu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/oc/navmenu.php b/resources/lang/oc/navmenu.php index 765c5fcef..b6f32abdd 100644 --- a/resources/lang/oc/navmenu.php +++ b/resources/lang/oc/navmenu.php @@ -8,6 +8,7 @@ return [ 'network' => 'Malhum', 'discover' => 'Descobrir', 'viewMyProfile' => 'Veire mon perfil', + 'myProfile' => 'Mon perfil', 'myTimeline' => 'Ma cronologia', 'publicTimeline' => 'Cronologia publica', 'remoteFollow' => 'Seguir a distància', From 83e58a5e76fc8032026f00eee16e2d1cfda9c96b Mon Sep 17 00:00:00 2001 From: okpierre <1679025+okpierre@users.noreply.github.com> Date: Sun, 8 Sep 2019 20:13:48 -0400 Subject: [PATCH 3/3] Update index.blade.php reference: https://github.com/pixelfed/pixelfed/issues/1680 --- resources/views/site/index.blade.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index c64f57e12..03be6fd9c 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -170,19 +170,6 @@ - + @include('layouts.partial.footer')