From 9d82462cc1ff64e3dd655613ae67daa4f7050ebc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 a19889105..a59f22a14 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 7cddc3cfd2d6142b25799c68c9b646592c62b6d4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 051247a0e..5a0dbd564 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 4ff8a12609386a787982fb77691f4696ca04bf24 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 072ae73d0..ef7c00847 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 cc179008864c3fe97e55c2f1da93cde47a6993b7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 7d4893af2..6cf7b8aa7 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 b0ab5836211239320c4b2c2baf0122bbaf942d13 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 4483ab070..534a3d6d1 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 43cb73c5ffd65ee7200df2196b7bea96b446e49d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 7fdc93331..8d6123cc5 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 ac42b00d4532dcaaa9d1bc0ca95055ed9fa07f8a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 2c33d7997..3a89c9695 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 9dcf41ca105140cf19f860c1791d533cb0e4e6d7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 b66414737..a0889fee7 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 ad5a3d38597d1015babd8795b06519baeb1b00bd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 7fdc93331..8d6123cc5 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 a8c9d5c8820b8538ca7dcc54d9568b25e7116847 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 bde97f36b..a8b83a8c7 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 a1b6da0048637951cfc5e63ade542b857a07b7b8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 7fdc93331..8d6123cc5 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 231d4bdaef2abe91b4da5da60ddbff88cce1de93 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 6cf7b8aa7..d1ac719aa 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 c37a08ff5e4f113cea2c9f9c3942ee4b56e19133 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 a59f22a14..40c577760 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 4a1a1abb0b48ba3faab74275ff2b61e9c9205b8e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 5a0dbd564..e6a16b76f 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 507bed4f3b1c67f54c6deddd99b71cc070cd3cb3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 ef7c00847..5f2a82c4e 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 d9cc9c6c9d470303c8607cc8d66848d8f8e871ce Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 d1ac719aa..ef4e2f2ea 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 9c5bd127764031119688e9b3d17ec81761530db2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 534a3d6d1..2e612a7a8 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 424162b87b4fbfe4b17f66a918313dabe4d574b1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 8d6123cc5..330c3f57e 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 457893f9a94fb36429532a7ddbd2e0fcae20d5a3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 3a89c9695..8196f3335 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 cd28a31d5b3e45decc8df91bda08cf3c434af24e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 a0889fee7..993be9cbe 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 8add9af9ef3d38e8f3ff9ed3778a7997eb4da11e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 8d6123cc5..330c3f57e 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 82580f5fd07f6bf5c1fbaed428be7a20786d12d1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 a8b83a8c7..831f233d7 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 bb72103fa007e142e7d5487c45af892f4a242745 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 8d6123cc5..330c3f57e 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 4726b18ff5cf31945d000f3e16fa7b23a1ca5c6c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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 ef4e2f2ea..2d3cbc1b3 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 5c32223b6df9e8965c71deb09f34c813cf86ac99 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
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 d29b62811..d4daa6f47 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 2e9a4e8f154a380a2f5e2561eba7fe920b63f689 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
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 c9b352fe8..8b3537bb1 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
}],