From 8f20edaed0bdbf381a99c92dc5ad8bd2cd9dd582 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:06 +0900 Subject: [PATCH 01/26] New translations ja.yml (French) --- locales/fr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/fr.yml b/locales/fr.yml index a198891054..a59f22a14a 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -85,6 +85,7 @@ common: widgets: "Widgets" home: "Accueil" local: "Local" + hybrid: "ハイブリッド" global: "Global" notifications: "Notifications" list: "Liste" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Accueil" local: "Local" + hybrid: "ハイブリッド" global: "Global" list: "Listes" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Accueil" local: "Local" + hybrid: "ハイブリッド" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messagerie" From 80e7af30d0d76ccd08650721481e1f00b2b6f8f2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:08 +0900 Subject: [PATCH 02/26] New translations ja.yml (German) --- locales/de.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/de.yml b/locales/de.yml index 051247a0ef..5a0dbd564e 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -85,6 +85,7 @@ common: widgets: "Widget hinzufügen:" home: "Startseite" local: "Lokal" + hybrid: "ハイブリッド" global: "Global" notifications: "Mitteilungen" list: "Listen" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Lokal" + hybrid: "ハイブリッド" global: "Global" list: "Listen" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From ea5146016924d0bd50335d0bd046e72418e973f9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:10 +0900 Subject: [PATCH 03/26] New translations ja.yml (Spanish) --- locales/es.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/es.yml b/locales/es.yml index 072ae73d0e..ef7c00847c 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -85,6 +85,7 @@ common: widgets: "Accesorios" home: "Inicio" local: "Local" + hybrid: "ハイブリッド" global: "Global" notifications: "Notificaciones" list: "Listado" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From c488fca2f20812df92826d43a3fffac953cfcf6a Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:12 +0900 Subject: [PATCH 04/26] New translations ja.yml (English) --- locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/en.yml b/locales/en.yml index 7d4893af25..6cf7b8aa79 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -85,6 +85,7 @@ common: widgets: "Widgets" home: "Home" local: "Local" + hybrid: "ハイブリッド" global: "Global" notifications: "Notifications" list: "Lists" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Local" + hybrid: "ハイブリッド" global: "Global" list: "Lists" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Home" local: "Local" + hybrid: "ハイブリッド" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messaging" From 6766fbdfb3a60d59e683bae3a1a996118157ec1e Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:14 +0900 Subject: [PATCH 05/26] New translations ja.yml (Russian) --- locales/ru.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/ru.yml b/locales/ru.yml index 4483ab0708..534a3d6d18 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 85343b80b79ab90dc6c791bf5b0d4f9023746533 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:16 +0900 Subject: [PATCH 06/26] New translations ja.yml (Italian) --- locales/it.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/it.yml b/locales/it.yml index 7fdc933318..8d6123cc5e 100644 --- a/locales/it.yml +++ b/locales/it.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 25b88f89a6b5e87ff081917b64d547be48b3d0ff Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:18 +0900 Subject: [PATCH 07/26] New translations ja.yml (Chinese Simplified) --- locales/zh.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/zh.yml b/locales/zh.yml index 2c33d79973..3a89c96955 100644 --- a/locales/zh.yml +++ b/locales/zh.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 88d0b09c8868399a26444ac8c08ee74a6d956c5a Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:20 +0900 Subject: [PATCH 08/26] New translations ja.yml (Polish) --- locales/pl.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/pl.yml b/locales/pl.yml index b66414737d..a0889fee7e 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -85,6 +85,7 @@ common: widgets: "Widżety" home: "Strona główna" local: "Lokalne" + hybrid: "ハイブリッド" global: "Globalne" notifications: "Powiadomienia" list: "Listy" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Strona główna" local: "Lokalne" + hybrid: "ハイブリッド" global: "Globalne" list: "Listy" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Strona główna" local: "Lokalne" + hybrid: "ハイブリッド" global: "Globalne" mobile/views/pages/messaging.vue: messaging: "Wiadomości" From 3506dd3656fff595e7e859e21319089dff7ede01 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:22 +0900 Subject: [PATCH 09/26] New translations ja.yml (Korean) --- locales/ko.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/ko.yml b/locales/ko.yml index 7fdc933318..8d6123cc5e 100644 --- a/locales/ko.yml +++ b/locales/ko.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From bb98ee27a112e6849979c622a4dcd8467a2eeb14 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:24 +0900 Subject: [PATCH 10/26] New translations ja.yml (Portuguese) --- locales/pt.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/pt.yml b/locales/pt.yml index bde97f36bf..a8b83a8c72 100644 --- a/locales/pt.yml +++ b/locales/pt.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 5f9482e7d5cb49c0d92464ec44a0f88c2a853860 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 11 Jul 2018 14:11:26 +0900 Subject: [PATCH 11/26] New translations ja.yml (Catalan) --- locales/ca.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/ca.yml b/locales/ca.yml index 7fdc933318..8d6123cc5e 100644 --- a/locales/ca.yml +++ b/locales/ca.yml @@ -85,6 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" notifications: "通知" list: "リスト" @@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -818,6 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" + hybrid: "ハイブリッド" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 9917a1c7e187cd28b74c49320aae962948cc92ce Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 12 Jul 2018 01:21:24 +0900 Subject: [PATCH 12/26] New translations ja.yml (English) --- locales/en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 6cf7b8aa79..d1ac719aa2 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -85,7 +85,7 @@ common: widgets: "Widgets" home: "Home" local: "Local" - hybrid: "ハイブリッド" + hybrid: "Hybrid" global: "Global" notifications: "Notifications" list: "Lists" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Local" - hybrid: "ハイブリッド" + hybrid: "Hybrid" global: "Global" list: "Lists" desktop/views/components/ui.header.vue: @@ -568,7 +568,7 @@ desktop/views/components/ui.header.account.vue: favorites: "Favorites" lists: "Lists" follow-requests: "Follow requests" - customize: "Customization of the home layout" + customize: "Customize home layout" settings: "Settings" signout: "Sign out" dark: "Submerge in dark" @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Home" local: "Local" - hybrid: "ハイブリッド" + hybrid: "Hybrid" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messaging" From 17ccfcfb53473d552d3d6f7851daa8ac06cc106a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:19 +0900 Subject: [PATCH 13/26] New translations ja.yml (French) --- locales/fr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/fr.yml b/locales/fr.yml index a59f22a14a..40c5777600 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -85,7 +85,7 @@ common: widgets: "Widgets" home: "Accueil" local: "Local" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" notifications: "Notifications" list: "Liste" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Accueil" local: "Local" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" list: "Listes" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Accueil" local: "Local" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messagerie" From 4e3a2c4bb8e6a3d1f2876226779cb358f3d3d194 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:22 +0900 Subject: [PATCH 14/26] New translations ja.yml (German) --- locales/de.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/de.yml b/locales/de.yml index 5a0dbd564e..e6a16b76f5 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -85,7 +85,7 @@ common: widgets: "Widget hinzufügen:" home: "Startseite" local: "Lokal" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" notifications: "Mitteilungen" list: "Listen" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Lokal" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" list: "Listen" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 2c0aac5eede847581329c4ed2f24e45554760200 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:24 +0900 Subject: [PATCH 15/26] New translations ja.yml (Spanish) --- locales/es.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/es.yml b/locales/es.yml index ef7c00847c..5f2a82c4eb 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -85,7 +85,7 @@ common: widgets: "Accesorios" home: "Inicio" local: "Local" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Global" notifications: "Notificaciones" list: "Listado" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From f952dde1d463dabb4ec5e5d198d01cd011520a8c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:25 +0900 Subject: [PATCH 16/26] New translations ja.yml (English) --- locales/en.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index d1ac719aa2..ef4e2f2eaf 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -85,7 +85,7 @@ common: widgets: "Widgets" home: "Home" local: "Local" - hybrid: "Hybrid" + hybrid: "コミュニティ" global: "Global" notifications: "Notifications" list: "Lists" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Local" - hybrid: "Hybrid" + hybrid: "コミュニティ" global: "Global" list: "Lists" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Home" local: "Local" - hybrid: "Hybrid" + hybrid: "コミュニティ" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messaging" From 5df54700b83f44b5cd93d1b7d7853a82f2122369 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:27 +0900 Subject: [PATCH 17/26] New translations ja.yml (Russian) --- locales/ru.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/ru.yml b/locales/ru.yml index 534a3d6d18..2e612a7a8f 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 63653ccb01e09a3b50a241059c710782be1d2db5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:29 +0900 Subject: [PATCH 18/26] New translations ja.yml (Italian) --- locales/it.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/it.yml b/locales/it.yml index 8d6123cc5e..330c3f57e1 100644 --- a/locales/it.yml +++ b/locales/it.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 912964104b8876351d956e66e3a17c925dd9ae67 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:32 +0900 Subject: [PATCH 19/26] New translations ja.yml (Chinese Simplified) --- locales/zh.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/zh.yml b/locales/zh.yml index 3a89c96955..8196f3335f 100644 --- a/locales/zh.yml +++ b/locales/zh.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 26664a835150e9231b27dc271b20aa57b157ea62 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:34 +0900 Subject: [PATCH 20/26] New translations ja.yml (Polish) --- locales/pl.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/pl.yml b/locales/pl.yml index a0889fee7e..993be9cbe5 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -85,7 +85,7 @@ common: widgets: "Widżety" home: "Strona główna" local: "Lokalne" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Globalne" notifications: "Powiadomienia" list: "Listy" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Strona główna" local: "Lokalne" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Globalne" list: "Listy" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Strona główna" local: "Lokalne" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "Globalne" mobile/views/pages/messaging.vue: messaging: "Wiadomości" From 77327c7a40c9ef4d2c9c05d9b01224e703b09915 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:36 +0900 Subject: [PATCH 21/26] New translations ja.yml (Korean) --- locales/ko.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/ko.yml b/locales/ko.yml index 8d6123cc5e..330c3f57e1 100644 --- a/locales/ko.yml +++ b/locales/ko.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From b6de5a226841f982d769f0879a511fbed850f179 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:37 +0900 Subject: [PATCH 22/26] New translations ja.yml (Portuguese) --- locales/pt.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/pt.yml b/locales/pt.yml index a8b83a8c72..831f233d7c 100644 --- a/locales/pt.yml +++ b/locales/pt.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From 3830b0d831e4f842b72169a87b819dddfadab40f Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:01:40 +0900 Subject: [PATCH 23/26] New translations ja.yml (Catalan) --- locales/ca.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/ca.yml b/locales/ca.yml index 8d6123cc5e..330c3f57e1 100644 --- a/locales/ca.yml +++ b/locales/ca.yml @@ -85,7 +85,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: messaging: "メッセージ" From ff278c8beae30a78791dc2a4b30da318d409124c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:22:08 +0900 Subject: [PATCH 24/26] New translations ja.yml (English) --- locales/en.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index ef4e2f2eaf..2d3cbc1b36 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -85,7 +85,7 @@ common: widgets: "Widgets" home: "Home" local: "Local" - hybrid: "コミュニティ" + hybrid: "Community" global: "Global" notifications: "Notifications" list: "Lists" @@ -557,7 +557,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "Home" local: "Local" - hybrid: "コミュニティ" + hybrid: "Community" global: "Global" list: "Lists" desktop/views/components/ui.header.vue: @@ -820,7 +820,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "Home" local: "Local" - hybrid: "コミュニティ" + hybrid: "Community" global: "Global" mobile/views/pages/messaging.vue: messaging: "Messaging" From 25a6f7041af3ab846e379607aca57764991b406c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:34:05 +0900 Subject: [PATCH 25/26] Fix bug --- src/services/note/create.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/services/note/create.ts b/src/services/note/create.ts index d29b628119..d4daa6f477 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -269,6 +269,8 @@ export default async (user: IUser, data: { // Publish note to local and hybrid timeline stream if (note.visibility != 'home') { publishLocalTimelineStream(noteObj); + } + if (note.visibility == 'public') { publishHybridTimelineStream(null, noteObj); } } @@ -281,9 +283,11 @@ export default async (user: IUser, data: { if (note.visibility == 'specified') { data.visibleUsers.forEach(async u => { - stream(u._id, 'note', await pack(note, u, { + const n = await pack(note, u, { detail: true - })); + }); + stream(u._id, 'note', n); + publishHybridTimelineStream(u._id, n); }); } @@ -304,10 +308,7 @@ export default async (user: IUser, data: { // Publish event to followers stream stream(following.followerId, 'note', noteObj); - - if (isRemoteUser(user)) { - publishHybridTimelineStream(following.followerId, noteObj); - } + publishHybridTimelineStream(following.followerId, noteObj); } else { //#region AP配送 // フォロワーがリモートユーザーかつ投稿者がローカルユーザーなら投稿を配信 From dc8f14c23aa01a9e145f77ea072cb7ae7f90c365 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:36:39 +0900 Subject: [PATCH 26/26] Fix #1887 --- src/server/api/endpoints/notes/hybrid-timeline.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index c9b352fe8e..8b3537bb1e 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -124,6 +124,9 @@ export default async (params: any, user: ILocalUser) => { // フォローしている人の投稿 $or: followQuery }, { + // public only + visibility: 'public', + // local '_user.host': null }],