From b67ac5e48b321da058e966456b6fa9acdd0af710 Mon Sep 17 00:00:00 2001 From: kPherox Date: Thu, 5 Mar 2020 20:15:02 +0900 Subject: [PATCH 01/21] Fix menu l10n Rename `listDesc` to `menuDesc` Add `menu` to other than japanese --- app/view/make/language/af-ZA/index.json | 5 +++-- app/view/make/language/ar-SA/index.json | 5 +++-- app/view/make/language/bg-BG/index.json | 5 +++-- app/view/make/language/bg/index.json | 5 +++-- app/view/make/language/ca-ES/index.json | 5 +++-- app/view/make/language/cs-CZ/index.json | 5 +++-- app/view/make/language/cs/index.json | 5 +++-- app/view/make/language/da-DK/index.json | 5 +++-- app/view/make/language/de-DE/index.json | 5 +++-- app/view/make/language/de/index.json | 5 +++-- app/view/make/language/el-GR/index.json | 5 +++-- app/view/make/language/en/index.json | 3 ++- app/view/make/language/es-AR/index.json | 5 +++-- app/view/make/language/es-ES/index.json | 5 +++-- app/view/make/language/fi-FI/index.json | 5 +++-- app/view/make/language/fr-FR/index.json | 5 +++-- app/view/make/language/he-IL/index.json | 5 +++-- app/view/make/language/hu-HU/index.json | 5 +++-- app/view/make/language/it-IT/index.json | 5 +++-- app/view/make/language/nl-NL/index.json | 5 +++-- app/view/make/language/no-NO/index.json | 5 +++-- app/view/make/language/pl-PL/index.json | 5 +++-- app/view/make/language/pt-BR/index.json | 5 +++-- app/view/make/language/pt-PT/index.json | 5 +++-- app/view/make/language/ro-RO/index.json | 5 +++-- app/view/make/language/ru-RU/index.json | 5 +++-- app/view/make/language/sr-SP/index.json | 5 +++-- app/view/make/language/sv-SE/index.json | 5 +++-- app/view/make/language/tr-TR/index.json | 5 +++-- app/view/make/language/uk-UA/index.json | 5 +++-- app/view/make/language/vi-VN/index.json | 5 +++-- app/view/make/language/zh-CN/index.json | 5 +++-- app/view/make/language/zh-TW/index.json | 5 +++-- 33 files changed, 98 insertions(+), 65 deletions(-) diff --git a/app/view/make/language/af-ZA/index.json b/app/view/make/language/af-ZA/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/af-ZA/index.json +++ b/app/view/make/language/af-ZA/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/ar-SA/index.json b/app/view/make/language/ar-SA/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/ar-SA/index.json +++ b/app/view/make/language/ar-SA/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/bg-BG/index.json b/app/view/make/language/bg-BG/index.json index ea61b90e..92ebfd69 100644 --- a/app/view/make/language/bg-BG/index.json +++ b/app/view/make/language/bg-BG/index.json @@ -178,10 +178,11 @@ "active": "Наскоро активен", "newcomer": "Новодошли", "local_only": "Само местно", + "menu": "Menu", "demoBottomBtns": "Ръководство за добре дошли", "lookAtBottom": "Погледнете в края на този прозорец. Ето няколко съвета за това.", "acctManDesc": "Добавете още акаунти и излезте от тях.", "settingDesc": "Много. много предпочитания са тук. Няма да можете да ги проверите всички!", "nanoDescPlus": "Клиент мини прозорец (експериментално)", - "listDesc": "Всички настройки на TheDesk и Mastodon, като добавяне и сортиране на колони , списък и проверка на филтрите ." -} \ No newline at end of file + "menuDesc": "Всички настройки на TheDesk и Mastodon, като добавяне и сортиране на колони , списък и проверка на филтрите ." +} diff --git a/app/view/make/language/bg/index.json b/app/view/make/language/bg/index.json index 2f52893c..9e1234c2 100644 --- a/app/view/make/language/bg/index.json +++ b/app/view/make/language/bg/index.json @@ -169,10 +169,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/ca-ES/index.json b/app/view/make/language/ca-ES/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/ca-ES/index.json +++ b/app/view/make/language/ca-ES/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/cs-CZ/index.json b/app/view/make/language/cs-CZ/index.json index 1b0882eb..1e1127df 100644 --- a/app/view/make/language/cs-CZ/index.json +++ b/app/view/make/language/cs-CZ/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/cs/index.json b/app/view/make/language/cs/index.json index 87a3d991..4c8c3bc4 100644 --- a/app/view/make/language/cs/index.json +++ b/app/view/make/language/cs/index.json @@ -169,10 +169,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/da-DK/index.json b/app/view/make/language/da-DK/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/da-DK/index.json +++ b/app/view/make/language/da-DK/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/de-DE/index.json b/app/view/make/language/de-DE/index.json index 2ddbe435..4d44a324 100644 --- a/app/view/make/language/de-DE/index.json +++ b/app/view/make/language/de-DE/index.json @@ -178,10 +178,11 @@ "active": "Kürzlich aktiv", "newcomer": "Neu eingetroffen", "local_only": "Nur lokal", + "menu": "Menu", "demoBottomBtns": "Willkommensguide", "lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.", "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini-Fenster-Klient (experimentell)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/de/index.json b/app/view/make/language/de/index.json index b7c44385..61447061 100644 --- a/app/view/make/language/de/index.json +++ b/app/view/make/language/de/index.json @@ -169,10 +169,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/el-GR/index.json b/app/view/make/language/el-GR/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/el-GR/index.json +++ b/app/view/make/language/el-GR/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/en/index.json b/app/view/make/language/en/index.json index 206b848c..64ba3e82 100644 --- a/app/view/make/language/en/index.json +++ b/app/view/make/language/en/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." } \ No newline at end of file diff --git a/app/view/make/language/es-AR/index.json b/app/view/make/language/es-AR/index.json index 5d77b2f2..02ea0c2b 100644 --- a/app/view/make/language/es-AR/index.json +++ b/app/view/make/language/es-AR/index.json @@ -178,10 +178,11 @@ "active": "Recientemente activo", "newcomer": "Recién llegados", "local_only": "Sólo local", + "menu": "Menu", "demoBottomBtns": "Guía de bienvenida", "lookAtBottom": "Mirá en la parte inferior de esta ventana. Acá tenés algunas sugerencias.", "acctManDesc": "Agregá más cuentas y administralas.", "settingDesc": "Muchas configuraciones. ¡No vas a poder con todas!", "nanoDescPlus": "Miniventana (experimental)", - "listDesc": "Toda la configuración diaria de TheDesk y Mastodon como agergar y ordenar columnas, revisión de listas y filtros." -} \ No newline at end of file + "menuDesc": "Toda la configuración diaria de TheDesk y Mastodon como agergar y ordenar columnas, revisión de listas y filtros." +} diff --git a/app/view/make/language/es-ES/index.json b/app/view/make/language/es-ES/index.json index 7e829758..de147ec5 100644 --- a/app/view/make/language/es-ES/index.json +++ b/app/view/make/language/es-ES/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/fi-FI/index.json b/app/view/make/language/fi-FI/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/fi-FI/index.json +++ b/app/view/make/language/fi-FI/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/fr-FR/index.json b/app/view/make/language/fr-FR/index.json index 54703c6d..691dd7d6 100644 --- a/app/view/make/language/fr-FR/index.json +++ b/app/view/make/language/fr-FR/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/he-IL/index.json b/app/view/make/language/he-IL/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/he-IL/index.json +++ b/app/view/make/language/he-IL/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/hu-HU/index.json b/app/view/make/language/hu-HU/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/hu-HU/index.json +++ b/app/view/make/language/hu-HU/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/it-IT/index.json b/app/view/make/language/it-IT/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/it-IT/index.json +++ b/app/view/make/language/it-IT/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/nl-NL/index.json b/app/view/make/language/nl-NL/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/nl-NL/index.json +++ b/app/view/make/language/nl-NL/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/no-NO/index.json b/app/view/make/language/no-NO/index.json index 9d5014fb..3ce0ddca 100644 --- a/app/view/make/language/no-NO/index.json +++ b/app/view/make/language/no-NO/index.json @@ -178,10 +178,11 @@ "active": "Nylig aktive", "newcomer": "Nykommere", "local_only": "Kun lokalt", + "menu": "Menu", "demoBottomBtns": "Velkomstguide", "lookAtBottom": "Se på bunnen av dette vinduet. Her er noen tips om det.", "acctManDesc": "Legg til flere kontoer og logg dem ut.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/pl-PL/index.json b/app/view/make/language/pl-PL/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/pl-PL/index.json +++ b/app/view/make/language/pl-PL/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/pt-BR/index.json b/app/view/make/language/pt-BR/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/pt-BR/index.json +++ b/app/view/make/language/pt-BR/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/pt-PT/index.json b/app/view/make/language/pt-PT/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/pt-PT/index.json +++ b/app/view/make/language/pt-PT/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/ro-RO/index.json b/app/view/make/language/ro-RO/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/ro-RO/index.json +++ b/app/view/make/language/ro-RO/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/ru-RU/index.json b/app/view/make/language/ru-RU/index.json index 62afcdc7..640ab590 100644 --- a/app/view/make/language/ru-RU/index.json +++ b/app/view/make/language/ru-RU/index.json @@ -178,10 +178,11 @@ "active": "Последние активные", "newcomer": "Новые прибытия", "local_only": "Только локальные", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Посмотрите на нижнюю часть этого окна. Вот несколько советов по этому поводу.", "acctManDesc": "Добавьте больше аккаунтов и выйдите из них.", "settingDesc": "Здесь очень много настроек. Вы не сможете проверить все!", "nanoDescPlus": "Клиент мини-окна (экспериментальный)", - "listDesc": "Все ежедневные настройки TheDesk и Mastodon, такие как добавить и сортировать столбцы, список и проверка фильтра." -} \ No newline at end of file + "menuDesc": "Все ежедневные настройки TheDesk и Mastodon, такие как добавить и сортировать столбцы, список и проверка фильтра." +} diff --git a/app/view/make/language/sr-SP/index.json b/app/view/make/language/sr-SP/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/sr-SP/index.json +++ b/app/view/make/language/sr-SP/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/sv-SE/index.json b/app/view/make/language/sv-SE/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/sv-SE/index.json +++ b/app/view/make/language/sv-SE/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/tr-TR/index.json b/app/view/make/language/tr-TR/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/tr-TR/index.json +++ b/app/view/make/language/tr-TR/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/uk-UA/index.json b/app/view/make/language/uk-UA/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/uk-UA/index.json +++ b/app/view/make/language/uk-UA/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/vi-VN/index.json b/app/view/make/language/vi-VN/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/vi-VN/index.json +++ b/app/view/make/language/vi-VN/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/zh-CN/index.json b/app/view/make/language/zh-CN/index.json index 7aaea9de..1f4a4905 100644 --- a/app/view/make/language/zh-CN/index.json +++ b/app/view/make/language/zh-CN/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} diff --git a/app/view/make/language/zh-TW/index.json b/app/view/make/language/zh-TW/index.json index f8a299ff..ad8ff4d3 100644 --- a/app/view/make/language/zh-TW/index.json +++ b/app/view/make/language/zh-TW/index.json @@ -178,10 +178,11 @@ "active": "Recently active", "newcomer": "New arrivals", "local_only": "Local only", + "menu": "Menu", "demoBottomBtns": "Welcome guide", "lookAtBottom": "Look at the bottom of this window. Here is some tips about it.", "acctManDesc": "Add more accounts and logout them.", "settingDesc": "Many and many preferences here. You will couldn't check it all!", "nanoDescPlus": "Mini window client(experimental)", - "listDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." -} \ No newline at end of file + "menuDesc": "All daily TheDesk and Mastodon tuning like add and sort columns, list and filter check." +} From 38db36602c089b1b0478b6e7f341b35042d6efa6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 20:14:26 +0000 Subject: [PATCH 02/21] Bump json5 from 2.1.1 to 2.1.2 in /app Bumps [json5](https://github.com/json5/json5) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/master/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.1.1...v2.1.2) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/package.json b/app/package.json index cf877659..a73befe9 100644 --- a/app/package.json +++ b/app/package.json @@ -57,7 +57,7 @@ "jimp": "^0.9.3", "jquery": "^3.4.1", "jquery-ui-dist": "^1.12.1", - "json5": "^2.1.1", + "json5": "^2.1.2", "lodash": "^4.17.15", "materialize-css": "git://github.com/cutls/materialize#v1-dev", "sumchecker": "^3.0.1", diff --git a/app/yarn.lock b/app/yarn.lock index 65135c66..b7890dca 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1745,12 +1745,12 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^2.1.0, json5@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6" - integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ== +json5@^2.1.0, json5@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" + integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== dependencies: - minimist "^1.2.0" + minimist "^1.2.5" jsonfile@^4.0.0: version "4.0.0" @@ -1923,10 +1923,10 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" From 2d67a7df239d976d5a7cb3085d6224ec3a891454 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 20:12:41 +0000 Subject: [PATCH 03/21] Bump jimp from 0.9.3 to 0.9.6 in /app Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.9.3 to 0.9.6. - [Release notes](https://github.com/oliver-moran/jimp/releases) - [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliver-moran/jimp/compare/v0.9.3...v0.9.6) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 322 +++++++++++++++++++++++------------------------ 2 files changed, 162 insertions(+), 162 deletions(-) diff --git a/app/package.json b/app/package.json index cf877659..cbb165c2 100644 --- a/app/package.json +++ b/app/package.json @@ -54,7 +54,7 @@ "@fortawesome/fontawesome-free": "^5.12.1", "custom-electron-titlebar": "^3.2.2-hotfix62", "electron-dl": "^3.0.0", - "jimp": "^0.9.3", + "jimp": "^0.9.6", "jquery": "^3.4.1", "jquery-ui-dist": "^1.12.1", "json5": "^2.1.1", diff --git a/app/yarn.lock b/app/yarn.lock index 65135c66..60ea8f6f 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -42,281 +42,281 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550" integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw== -"@jimp/bmp@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.3.tgz#98eafc81674ce750f428ac9380007f1a4e90255e" - integrity sha512-wXZYccgGQAsIK8DZX0wZE3gbSd2mL2+eheSJMts6I5hQjxhVRZd1Gwu425nUQGzfKCOgKYTW0nLv7/8OoOTTkw== +"@jimp/bmp@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.6.tgz#379e261615d7c1f3b52af4d5a0f324666de53d7d" + integrity sha512-T2Fh/k/eN6cDyOx0KQ4y56FMLo8+mKNhBh7GXMQXLK2NNZ0ckpFo3VHDBZ3HnaFeVTZXF/atLiR9CfnXH+rLxA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" bmp-js "^0.1.0" core-js "^3.4.1" -"@jimp/core@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.3.tgz#bffbf955c046569bf4b682b575228e31bb41e445" - integrity sha512-kB9lvst1QhgYOC963SAuPgv+DdVfxTProphrSffAAoo5eLeQab/Ca3ZUeX1E/SnLSr+NGVnNCd8c9gyuKDiENg== +"@jimp/core@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.6.tgz#a553f801bd436526d36e8982b99e58e8afc3d17a" + integrity sha512-sQO04S+HZNid68a9ehb4BC2lmW6iZ5JgU9tC+thC2Lhix+N/XKDJcBJ6HevbLgeTzuIAw24C5EKuUeO3C+rE5w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" any-base "^1.1.0" buffer "^5.2.0" core-js "^3.4.1" exif-parser "^0.1.12" file-type "^9.0.0" load-bmfont "^1.3.1" - mkdirp "0.5.1" + mkdirp "^0.5.1" phin "^2.9.1" pixelmatch "^4.0.2" tinycolor2 "^1.4.1" -"@jimp/custom@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.3.tgz#b49dfe1d6b24e62fd4101a7db77104024c8d97e8" - integrity sha512-2E7yabQMeqjcK8+ZFu3Ja5cWyrB0zv/pmzNSDg/BBPJ59HE0fj/qcERAz6VklcjHUYRUfmE5uODsb+4DE0o/YQ== +"@jimp/custom@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.6.tgz#3d8a19d6ed717f0f1aa3f1b8f42fa374f43bc715" + integrity sha512-ZYKgrBZVoQwvIGlQSO7MFmn7Jn8a9X5g1g+KOTDO9Q0s4vnxdPTtr/qUjG9QYX6zW/6AK4LaIsDinDrrKDnOag== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/core" "^0.9.3" + "@jimp/core" "^0.9.6" core-js "^3.4.1" -"@jimp/gif@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.3.tgz#b2b1a519092f94a913a955f252996f9a968930db" - integrity sha512-DshKgMQ8lXorI/xTRyeRkZqZ3JqgnL2aGYAhx0SkAunyHgXji27chmrOGj/6KVDBucrDf/6mSexnSoUDnlWrfA== +"@jimp/gif@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.6.tgz#0a7b1e521daca635b02259f941bdb3600569d8e6" + integrity sha512-Z2muC2On8KHEVrWKCCM0L2eua9kw4bQETzT7gmVsizc8MXAKdS8AyVV9T3ZrImiI0o5UkAN/u0cPi1U2pSiD8Q== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" omggif "^1.0.9" -"@jimp/jpeg@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.3.tgz#a759cb3bccf3cb163166873b9bdc0c949c5991b5" - integrity sha512-AJzcTJXfN9BHtpzAbICwR3+GoH0pSr6OYXbAS6yuKwz+xVn9UHrEjQb74CIzIRqrT/VWcIKg29cMQxgokzWY7w== +"@jimp/jpeg@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.6.tgz#fb90bdc0111966987c5ba59cdca7040be86ead41" + integrity sha512-igSe0pIX3le/CKdvqW4vLXMxoFjTLjEaW6ZHt/h63OegaEa61TzJ2OM7j7DxrEHcMCMlkhUc9Bapk57MAefCTQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" jpeg-js "^0.3.4" -"@jimp/plugin-blit@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.3.tgz#740346ac62ec0f7ae4458f5fd59c7582e630a8e8" - integrity sha512-+UxCsJ3XkRSdpigpTBJ9WkdwUc3OtBlhVZdU6OL6M9ldume5Gj3rTyWvMCqytOK1tZ/+7HmxoWe4IWX31hz9qA== +"@jimp/plugin-blit@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.6.tgz#7937e02e3514b95dbe4c70d444054847f6e9ce3c" + integrity sha512-zp7X6uDU1lCu44RaSY88aAvsSKbgqUrfDyWRX1wsamJvvZpRnp1WekWlGyydRtnlUBAGIpiHCHmyh/TJ2I4RWA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-blur@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.3.tgz#9df505aaa63de138060264cf83ed4a98304bf105" - integrity sha512-RADcYjZ5vbk5ZrUiK7qv0G4xOpHtu19HWVVX9JTDbm4VByWTxPboVKlgiYLA6l+IxIXNtEqDclsADIM0s9FQhA== +"@jimp/plugin-blur@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.6.tgz#3d74b18c27e9eae11b956ffe26290ece6d250813" + integrity sha512-xEi63hvzewUp7kzw+PI3f9CIrgZbphLI4TDDHWNYuS70RvhTuplbR6RMHD/zFhosrANCkJGr5OZJlrJnsCg6ug== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-color@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.3.tgz#4a5ad28f68901355878f5330186c260f4f87f944" - integrity sha512-gHDA5GVx4/R4fitEACKmWH7hNy0aU48MZWYRxmATvuqY39KidJ0fjwp+brQ3Ivgb35AgFVc2jQYc3U/JXv4RxQ== +"@jimp/plugin-color@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.6.tgz#d0fca0ed4c2c48fd6f929ef4a03cebf9c1342e14" + integrity sha512-o1HSoqBVUUAsWbqSXnpiHU0atKWy/Q1GUbZ3F5GWt/0OSDyl9RWM82V9axT2vePZHInKjIaimhnx1gGj8bfxkQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" tinycolor2 "^1.4.1" -"@jimp/plugin-contain@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.3.tgz#d0da9892edea25549611c88e125bfcc59045c426" - integrity sha512-vdYAtp65LNDT/hMctow5o0a/SbD41/y7Z9AO7MGsfUIK92Woq90SNTWx7JplDl4HSZGrqaBONnfiEhRiYlDrdg== +"@jimp/plugin-contain@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.6.tgz#7d7bbd5e9c2fa4391a3d63620e13a28f51e1e7e8" + integrity sha512-Xz467EN1I104yranET4ff1ViVKMtwKLg1uRe8j3b5VOrjtiXpDbjirNZjP3HTlv8IEUreWNz4BK7ZtfHSptufA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-cover@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.3.tgz#2fca63620fcf8145bdecf315cf461588b09d9488" - integrity sha512-yOwsvakgyS2/C4iZF1a1wg63QKfYvqb2d6k+rgY/0vaAe44JtEx+Gbg+7iOt4EaMm5BDlxRwmcA2Q8Pef8TvAQ== +"@jimp/plugin-cover@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.6.tgz#2853de7f8302f655ae8e95f51ab25a0ed77e3756" + integrity sha512-Ocr27AvtvH4ZT/9EWZgT3+HQV9fG5njwh2CYMHbdpx09O62Asj6pZ4QI0kKzOcux1oLgv59l7a93pEfMOfkfwQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-crop@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.3.tgz#9b19c11293714a99c03d4b517ab597a5f88823e8" - integrity sha512-kqMXSyY8hrfo0idr6qY2USOWPrNqpDWs+D6Vwa+kV6SGJhj3rMTIcptQDaamIETSxbjkE8rwUu3K4Q5UD69D7w== +"@jimp/plugin-crop@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.6.tgz#82e539af2a2417783abbd143124a57672ff4cc31" + integrity sha512-d9rNdmz3+eYLbSKcTyyp+b8Nmhf6HySnimDXlTej4UP6LDtkq2VAyVaJ12fz9x6dfd8qcXOBXMozSfNCcgpXYA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-displace@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.3.tgz#07645687b29ebc8a8491244410172795d511ba21" - integrity sha512-0AdwxYRWDmJ2wIRIj2RR3sRmNjMhcy5Kwt9Jbi/RRnzxkRScZAiyzkNZhBul23EM7ClfjrUrZufuUvRMHxZRDw== +"@jimp/plugin-displace@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.6.tgz#67564d081dc6b19007248ca222d025fd6f90c03b" + integrity sha512-SWpbrxiHmUYBVWtDDMjaG3eRDBASrTPaad7l07t73/+kmU6owAKWQW6KtVs05MYSJgXz7Ggdr0fhEn9AYLH1Rg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-dither@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.3.tgz#292b3ee617a5dcfe065d13b643055e910f8b6934" - integrity sha512-8OE+Xak9xepiCwSV+oAsb/gupTnttG3aDKxtpSZjwHebnr+k1VG8NgICbMSFATTVJqqZ18oj6LC+5726qHUJ9w== +"@jimp/plugin-dither@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.6.tgz#dc48669cf51f3933761aa9137e99ebfa000b8cce" + integrity sha512-abm1GjfYK7ru/PoxH9fAUmhl+meHhGEClbVvjjMMe5g2S0BSTvMJl3SrkQD/FMkRLniaS/Qci6aQhIi+8rZmSw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-flip@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.3.tgz#a755ffa1d860106067215987cbac213501d22b41" - integrity sha512-w+lzE1ZF/UOjB8qJdeIm+dLQtOK1obZwGYdCIbgxZxw4SfkkjAftJdY8o8RNOXhHDZqGu+cYQZbMKP1zcoNkyQ== +"@jimp/plugin-flip@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.6.tgz#f81f9b886da8cd56e23dd04d5aa359f2b94f939e" + integrity sha512-KFZTzAzQQ5bct3ii7gysOhWrTKVdUOghkkoSzLi+14nO3uS/dxiu8fPeH1m683ligbdnuM/b22OuLwEwrboTHA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-gaussian@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.3.tgz#b10b5a5b4c37cb4edc3ed22a9b25294e68daf2f8" - integrity sha512-RPrWwzlZsbWC2opSgeyWt30JU9Uwg1+GwBnoNpEMLKeqm0Dv6snASASa4zVtviGWAIq//p3Jrap7g57hKqL0Cg== +"@jimp/plugin-gaussian@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.6.tgz#6c93897ee0ff979466184d7d0ec0fbc95c679be4" + integrity sha512-WXKLtJKWchXfWHT5HIOq1HkPKpbH7xBLWPgVRxw00NV/6I8v4xT63A7/Nag78m00JgjwwiE7eK2tLGDbbrPYig== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-invert@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.3.tgz#723a873133a1d62f9b93e023991f262c85917c78" - integrity sha512-0lRsh7IPkzyYqExrZDT50h38xdlB/+KrdiDcuxWwWyIlKauLMR0kInjwf8sPeb3elPLeETmze7uwPAxrIAtsGQ== +"@jimp/plugin-invert@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.6.tgz#4b3fa7b81ea976b09b82b3db59ee00ac3093d2fd" + integrity sha512-Pab/cupZrYxeRp07N4L5a4C/3ksTN9k6Knm/o2G5C789OF0rYsGGLcnBR/6h69nPizRZHBYdXCEyXYgujlIFiw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-mask@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.3.tgz#6329ec861269244ab10ab9b3f54b1624c4ce0bab" - integrity sha512-nZ0J62Hly9JtMZctlSDVgnTd8Fg2XGikzAYilSTCjzIRtbXL5Be/qSAZrMfLD3CZ8exTxdlEGRkEJI3RZKXYCw== +"@jimp/plugin-mask@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.6.tgz#d70be0030ab3294b191f5b487fb655d776820b19" + integrity sha512-ikypRoDJkbxXlo6gW+EZOcTiLDIt0DrPwOFMt1bvL8UV2QPgX+GJ685IYwhIfEhBf/GSNFgB/NYsVvuSufTGeg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-normalize@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.3.tgz#564155032d1b9dc567dbb7427a85606a25427c30" - integrity sha512-0IvgTt4R15QJnoCHvvqlK56zOtCsQV7Mkx757kdNah8uyPGjadTcFBuqCaOMK943X36IIv+o7Ix7yvNUJZt4aw== +"@jimp/plugin-normalize@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.6.tgz#c9128412a53485d91236a1da241f3166e572be4a" + integrity sha512-V3GeuAJ1NeL7qsLoDjnypJq24RWDCwbXpKhtxB+Yg9zzgOCkmb041p7ysxbcpkuJsRpKLNABZeNCCqd83bRawA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-print@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.3.tgz#b4470137312232de9b35eaf412cd753f999c58d8" - integrity sha512-pV6oX5Bhe9O/dbgrotz46Bv6u1M+/n9G0kRUunDjwzXrvON5raBFEJHQDPcTXiqPT25Gc9Ba4/Akfo/Zl6+wgQ== +"@jimp/plugin-print@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.6.tgz#fea31ffeafee18ae7b5cfd6fa131bb205abfee51" + integrity sha512-gKkqZZPQtMSufHOL0mtJm5d/KI2O6+0kUpOBVSYdGedtPXA61kmVnsOd3wwajIMlXA3E0bDxLXLdAguWqjjGgw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" load-bmfont "^1.4.0" -"@jimp/plugin-resize@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.3.tgz#916abd57c4f9b426984354c77555ade1efda7a82" - integrity sha512-YzqVE8QoDIZpVuI52v+WejwEjEEiJfNFviQfprfm5af7uSSseZgDw1sJ0koqAu+liMSY+Ewp79v2SDrKoJKqtg== +"@jimp/plugin-resize@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.6.tgz#7fb939c8a42e2a3639d661cc7ab24057598693bd" + integrity sha512-r5wJcVII7ZWMuY2l6WSbHPG6gKMFemtCHmJRXGUu+/ZhPGBz3IFluycBpHkWW3OB+jfvuyv1EGQWHU50N1l8Og== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-rotate@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.3.tgz#aa0d674c08726c0ae3ebc7f2adbfca0a927b1d9f" - integrity sha512-kADY2pI3/yMyHbuyvKB4nqPoKf8DPQBU1b4zz2K7SxcwKh1krFf4Fa9mmhhDLoFwuNSy0SPb1JCMUO4BtFCFLA== +"@jimp/plugin-rotate@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.6.tgz#06d725155e5cdb615133f57a52f5a860a9d03f3e" + integrity sha512-B2nm/eO2nbvn1DgmnzMd79yt3V6kffhRNrKoo2VKcKFiVze1vGP3MD3fVyw5U1PeqwAFu7oTICFnCf9wKDWSqg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugin-scale@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.3.tgz#427fed7642883c27601aae33c25413980b6a2c50" - integrity sha512-vZaiL5Qc+WrgGEfUe4Y0vG+qbT6pe2TW68/mu124E1tKVcZjHKZUeFN0Wr/hP2myN6nqTYj0/sord2OS/04JpA== +"@jimp/plugin-scale@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.6.tgz#3fa939c1a4f44383e12afeb7c434eb41f20e4a1c" + integrity sha512-DLsLB5S3mh9+TZY5ycwfLgOJvUcoS7bP0Mi3I8vE1J91qmA+TXoWFFgrIVgnEPw5jSKzNTt8WhykQ0x2lKXncw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" -"@jimp/plugins@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.3.tgz#bdff9d49484469c4d74ef47c2708e75773ca22b9" - integrity sha512-KYCSgFGoZBNC0224X5yUnMHCZnCdUVrsu2Yo67o3XZfUgDjO81J+vdzZ0twpPQ6qLLVAP+nQ8hkRV/QzEUstMw== +"@jimp/plugins@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.6.tgz#a1cfdf9f3e1adf5b124686486343888a16c8fd27" + integrity sha512-eQI29e+K+3L/fb5GbPgsBdoftvaYetSOO2RL5z+Gjk6R4EF4QFRo63YcFl+f72Kc1b0JTOoDxClvn/s5GMV0tg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/plugin-blit" "^0.9.3" - "@jimp/plugin-blur" "^0.9.3" - "@jimp/plugin-color" "^0.9.3" - "@jimp/plugin-contain" "^0.9.3" - "@jimp/plugin-cover" "^0.9.3" - "@jimp/plugin-crop" "^0.9.3" - "@jimp/plugin-displace" "^0.9.3" - "@jimp/plugin-dither" "^0.9.3" - "@jimp/plugin-flip" "^0.9.3" - "@jimp/plugin-gaussian" "^0.9.3" - "@jimp/plugin-invert" "^0.9.3" - "@jimp/plugin-mask" "^0.9.3" - "@jimp/plugin-normalize" "^0.9.3" - "@jimp/plugin-print" "^0.9.3" - "@jimp/plugin-resize" "^0.9.3" - "@jimp/plugin-rotate" "^0.9.3" - "@jimp/plugin-scale" "^0.9.3" + "@jimp/plugin-blit" "^0.9.6" + "@jimp/plugin-blur" "^0.9.6" + "@jimp/plugin-color" "^0.9.6" + "@jimp/plugin-contain" "^0.9.6" + "@jimp/plugin-cover" "^0.9.6" + "@jimp/plugin-crop" "^0.9.6" + "@jimp/plugin-displace" "^0.9.6" + "@jimp/plugin-dither" "^0.9.6" + "@jimp/plugin-flip" "^0.9.6" + "@jimp/plugin-gaussian" "^0.9.6" + "@jimp/plugin-invert" "^0.9.6" + "@jimp/plugin-mask" "^0.9.6" + "@jimp/plugin-normalize" "^0.9.6" + "@jimp/plugin-print" "^0.9.6" + "@jimp/plugin-resize" "^0.9.6" + "@jimp/plugin-rotate" "^0.9.6" + "@jimp/plugin-scale" "^0.9.6" core-js "^3.4.1" timm "^1.6.1" -"@jimp/png@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.3.tgz#5c1bbb89b32e2332891a13efdb423e87287a8321" - integrity sha512-LJXUemDTSbTGAGEp9hNQH0uTRSB8gYeE6FsfT3M00oZincu6/WzDzl0P8E95rMjNxZqAihdTyOP3+kcrbbqX+w== +"@jimp/png@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.6.tgz#00ed7e6fb783b94f2f1a9fadf9a42bd75f70cc7f" + integrity sha512-9vhOG2xylcDqPbBf4lzpa2Sa1WNJrEZNGvPvWcM+XVhqYa8+DJBLYkoBlpI/qWIYA+eVWDnLF3ygtGj8CElICw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.9.3" + "@jimp/utils" "^0.9.6" core-js "^3.4.1" pngjs "^3.3.3" -"@jimp/tiff@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.3.tgz#a4498c0616fb24034f5512b159b75b0aea389e9c" - integrity sha512-w9H6dT+GDHN//Srsv27JhRn7R2byzUahOGfFw7KpIn95jg0ogcxjKTo/RAGQC56sr4U092e4Npl7E85Lt934WQ== +"@jimp/tiff@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.6.tgz#9ff12122e727ee15f27f40a710516102a636f66b" + integrity sha512-pKKEMqPzX9ak8mek2iVVoW34+h/TSWUyI4NjbYWJMQ2WExfuvEJvLocy9Q9xi6HqRuJmUxgNIiC5iZM1PDEEfg== dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" utif "^2.0.1" -"@jimp/types@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.3.tgz#75337245a1a8c7c84a414beca3cfeded338c0ef1" - integrity sha512-hUJKoT2IhnbO/trxNWzN19n8g+p7aKbM1R+71n4wMZnD41PzrVtz+sBBCdB+JCjBJs/i7fJt4d9z0i3Xe8m7Zw== +"@jimp/types@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.6.tgz#7be7f415ad93be733387c03b8a228c587a868a18" + integrity sha512-PSjdbLZ8d50En+Wf1XkWFfrXaf/GqyrxxgIwFWPbL+wrW4pmbYovfxSLCY61s8INsOFOft9dzzllhLBtg1aQ6A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/bmp" "^0.9.3" - "@jimp/gif" "^0.9.3" - "@jimp/jpeg" "^0.9.3" - "@jimp/png" "^0.9.3" - "@jimp/tiff" "^0.9.3" + "@jimp/bmp" "^0.9.6" + "@jimp/gif" "^0.9.6" + "@jimp/jpeg" "^0.9.6" + "@jimp/png" "^0.9.6" + "@jimp/tiff" "^0.9.6" core-js "^3.4.1" timm "^1.6.1" -"@jimp/utils@^0.9.3": - version "0.9.3" - resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.3.tgz#fd7af0d1138febbeacc841be4b802218444ce088" - integrity sha512-9D2Of6BcjYONtl77YfmU2y5aRMLe0/O2e2aQvfCxdNwD33jRdwNdN4i3m73dpiClNquApIjL4nYGhTixA4UstA== +"@jimp/utils@^0.9.6": + version "0.9.6" + resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.6.tgz#a3e6c29e835e2b9ea9f3899c9d3d230dc63bd518" + integrity sha512-kzxcp0i4ecSdMXFEmtH+NYdBQysINEUTsrjm7v0zH8t/uwaEMOG46I16wo/iPBXJkUeNdL2rbXoGoxxoeSfrrA== dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" @@ -1685,15 +1685,15 @@ itunes-nowplaying-mac@0.3.1: resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986" integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ== -jimp@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.3.tgz#85e8e80eea65a7e6de806c6bb622ec6a7244e6f3" - integrity sha512-dIxvT1OMRkd3+B18XUhJ5WZ2Dw7Hp8mvjaTqfi945zZ7fga6LT22h3NLYDorHHAiy9z30KjfNnOgpBoxrdjDZg== +jimp@^0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.6.tgz#abf381daf193a4fa335cb4ee0e22948049251eb9" + integrity sha512-DBDHYeNVqVpoPkcvo0PKTNGvD+i7NYvkKTsl0I3k7ql36uN8wGTptRg0HtgQyYE/bhGSLI6Lq5qLwewaOPXNfg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/custom" "^0.9.3" - "@jimp/plugins" "^0.9.3" - "@jimp/types" "^0.9.3" + "@jimp/custom" "^0.9.6" + "@jimp/plugins" "^0.9.6" + "@jimp/types" "^0.9.6" core-js "^3.4.1" regenerator-runtime "^0.13.3" From d44724d7842412e72debda98402bb5b542e177e4 Mon Sep 17 00:00:00 2001 From: cutls Date: Thu, 19 Mar 2020 12:30:14 +0900 Subject: [PATCH 04/21] Add tips for developers not to fail to fail to constructing --- app/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.js b/app/main.js index af143831..dc7a81ea 100644 --- a/app/main.js +++ b/app/main.js @@ -55,7 +55,7 @@ if (process.argv.indexOf('--dev') === -1) { '|||| /////\n' + '||||//////' ) - console.log('Welcome!') + console.log('If it does not show the window, you might forget `npm run construct`.') } var info_path = join(app.getPath('userData'), 'window-size.json') var max_info_path = join(app.getPath('userData'), 'max-window-size.json') From 3531c338de1b01ceb9a6a08641404c171c4c0e85 Mon Sep 17 00:00:00 2001 From: cutls Date: Thu, 19 Mar 2020 13:17:02 +0900 Subject: [PATCH 05/21] Add: cool frame of the window, default: off --- app/js/platform/preload.js | 27 ++++++++++++++--------- app/js/ui/settings.js | 6 +++++ app/main.js | 25 ++++++++++++++++----- app/main/language.js | 9 +++++++- app/main/system.js | 9 ++++++++ app/view/make/language/en/setting.json | 4 ++++ app/view/make/language/ja-KS/setting.json | 4 ++++ app/view/make/language/ja/setting.json | 4 ++++ app/view/make/setting.sample.html | 5 ++++- app/view/make/setting.sample.js | 20 +++++++++++++++++ 10 files changed, 95 insertions(+), 18 deletions(-) diff --git a/app/js/platform/preload.js b/app/js/platform/preload.js index e39178a6..235008c4 100644 --- a/app/js/platform/preload.js +++ b/app/js/platform/preload.js @@ -4,18 +4,21 @@ var ipc = electron.ipcRenderer //title bar const customTitlebar = require('custom-electron-titlebar') window.addEventListener('DOMContentLoaded', () => { - const file = location.href.substr(-10) - if ( - file == 'index.html' || - file == '/acct.html' || - file == 'tting.html' - ) { - new customTitlebar.Titlebar({ - backgroundColor: customTitlebar.Color.fromHex('#000'), - titleHorizontalAlignment: 'right', - icon: '../../img/desk.png' + ipc.send('frameCheck', '') + ipc.on('frame', function(event, args) { + const file = location.href.substr(-10) + if ( + file == 'index.html' || + file == '/acct.html' || + file == 'tting.html' + ) { + new customTitlebar.Titlebar({ + backgroundColor: customTitlebar.Color.fromHex('#000'), + titleHorizontalAlignment: 'right', + icon: '../../img/desk.png' + }) + } }) - } }) onmessage = function(e) { @@ -65,6 +68,8 @@ onmessage = function(e) { ipc.send('theme-json-request', e.data[1]) } else if (e.data[0] == 'ha') { ipc.send('ha', e.data[1]) + } else if (e.data[0] == 'frameSet') { + ipc.send('frameSet', e.data[1]) } else if (e.data[0] == 'ua') { ipc.send('ua', e.data[1]) } else if (e.data[0] == 'aboutData') { diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js index d756810a..b3f17063 100644 --- a/app/js/ui/settings.js +++ b/app/js/ui/settings.js @@ -17,6 +17,9 @@ var envView = new Vue({ if (ls == 'ua_setting') { useragent(val) } + if (ls == 'frame') { + frameSet(val) + } return true } } @@ -764,6 +767,9 @@ function hardwareAcceleration(had) { function useragent(val) { postMessage(['ua', val], '*') } +function frameSet(val) { + postMessage(['frameSet', val], '*') +} function customSound(key) { postMessage(['customSound', key], '*') } diff --git a/app/main.js b/app/main.js index dc7a81ea..faa3be90 100644 --- a/app/main.js +++ b/app/main.js @@ -62,6 +62,7 @@ var max_info_path = join(app.getPath('userData'), 'max-window-size.json') var lang_path = join(app.getPath('userData'), 'language') var ha_path = join(app.getPath('userData'), 'hardwareAcceleration') var ua_path = join(app.getPath('userData'), 'useragent') +var frame_path = join(app.getPath('userData'), 'frame') try { fs.readFileSync(ha_path, 'utf8') app.disableHardwareAcceleration() @@ -97,6 +98,16 @@ function isFile(file) { if (err.code === 'ENOENT') return false } } +try { + var frameRaw = fs.readFileSync(frame_path, 'utf8') + if(frameRaw == 'false') { + var frame = false + } else { + var frame = true + } +} catch { + var frame = true +} // 全てのウィンドウが閉じたら終了 app.on('window-all-closed', function() { electron.session.defaultSession.clearCache(() => {}) @@ -142,7 +153,7 @@ function createWindow() { y: window_size.y, icon: __dirname + '/desk.png', show: false, - frame: false, + frame: frame, resizable: true } } else if (platform == 'win32') { @@ -158,7 +169,8 @@ function createWindow() { x: window_size.x, y: window_size.y, simpleFullscreen: true, - show: false + show: false, + frame: frame } } else if (platform == 'darwin') { var arg = { @@ -173,7 +185,8 @@ function createWindow() { x: window_size.x, y: window_size.y, simpleFullscreen: true, - show: false + show: false, + frame: frame, } } mainWindow = new BrowserWindow(arg) @@ -282,9 +295,11 @@ function createWindow() { var platform = process.platform var bit = process.arch Menu.setApplicationMenu( - Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname)) + Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)) ) - mainWindow.setMenu(null) + if(!frame) { + mainWindow.setMenu(null) + } //CSS css.css(mainWindow) //アップデータとダウンロード diff --git a/app/main/language.js b/app/main/language.js index 07ef568c..8b9beb30 100644 --- a/app/main/language.js +++ b/app/main/language.js @@ -1,12 +1,19 @@ // Create the Application's main menu -function templete(lang, mainWindow, packaged, dir, dirname) { +function templete(lang, mainWindow, packaged, dir, dirname, frame) { + //フレーム if(lang !="ja" && lang != "en"){ lang = "en" } const electron = require("electron"); + const ipc = electron.ipcMain; const app = electron.app; const BrowserWindow = electron.BrowserWindow; const join = require('path').join; + ipc.on("frameCheck", function(e, arg) { + if(!frame) { + e.sender.webContents.send("frame", ""); + } + }); const dict = { "application": { "ja": "アプリケーション", diff --git a/app/main/system.js b/app/main/system.js index a671f241..fa7f3556 100644 --- a/app/main/system.js +++ b/app/main/system.js @@ -12,6 +12,7 @@ function system(mainWindow, dir, lang, dirname) { var ua_path = join(app.getPath("userData"), "useragent"); var lang_path = join(app.getPath("userData"), "language"); var log_dir_path = join(app.getPath("userData"), "logs"); + var frame_path = join(app.getPath("userData"), "frame"); //ログ var today = new Date(); //今日のやつ @@ -115,6 +116,7 @@ function system(mainWindow, dir, lang, dirname) { app.relaunch(); app.exit(); }); + //ユーザーエージェント ipc.on("ua", function(e, arg) { if (arg == "") { fs.unlink(ua_path, function(err) {}); @@ -124,6 +126,12 @@ function system(mainWindow, dir, lang, dirname) { app.relaunch(); app.exit(); }); + //フレームのありなし + ipc.on("frameSet", function(e, arg) { + fs.writeFileSync(frame_path, arg); + app.relaunch(); + app.exit(); + }); ipc.on("quit", (e, args) => { app.quit(); @@ -278,6 +286,7 @@ function system(mainWindow, dir, lang, dirname) { e.sender.webContents.send("logData", logs); }); }); + //起動時ログディレクトリ存在確認と作成、古ログ削除 fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => { if (error) { diff --git a/app/view/make/language/en/setting.json b/app/view/make/language/en/setting.json index b4448f33..89485722 100644 --- a/app/view/make/language/en/setting.json +++ b/app/view/make/language/en/setting.json @@ -4,6 +4,8 @@ "yes": "Yes", "no": "No", "none": "None", + "show": "Show", + "hide": "Hide", "default": "Default", "change": "Change", "select": "Select", @@ -34,6 +36,8 @@ "savefolderwarn": "TheDesk uses this value when it try to save pictures or take screenshots.", "useragent":"User agent", "useragentWarn":"Restart when changed", + "frame": "Window frame", + "frameWarn": "If 'off', the window looks cool.", "absolute": "absolute value", "srcUrl": "Search engine", "srcUrlWarn": "{q} will be replaced to query.", diff --git a/app/view/make/language/ja-KS/setting.json b/app/view/make/language/ja-KS/setting.json index 77715d19..0e129112 100644 --- a/app/view/make/language/ja-KS/setting.json +++ b/app/view/make/language/ja-KS/setting.json @@ -4,6 +4,8 @@ "yes": "はい", "no": "いいえ", "none": "なし", + "show": "表示", + "hide": "非表示", "default": "既定", "change": "変更", "select": "選択", @@ -33,6 +35,8 @@ "savefolderwarn": "画像ダウンロードやスクリーンショットはここに保存や。", "useragent":"ユーザーエージェント", "useragentWarn":"再起動すんで。", + "frame": "ウィンドウのフレーム", + "frameWarn": "フレーム無しやとタイトルバーがシュッとするで。再起動すんで。", "absolute": "絶対指定", "srcUrl": "検索エンジン", "srcUrlWarn": "{q}が検索文字列になるで。", diff --git a/app/view/make/language/ja/setting.json b/app/view/make/language/ja/setting.json index 1be2437f..09f39af3 100644 --- a/app/view/make/language/ja/setting.json +++ b/app/view/make/language/ja/setting.json @@ -4,6 +4,8 @@ "yes": "はい", "no": "いいえ", "none": "なし", + "show": "表示", + "hide": "非表示", "default": "既定", "change": "変更", "select": "選択", @@ -34,6 +36,8 @@ "savefolderwarn": "画像ダウンロードやスクリーンショットに影響します。", "useragent":"ユーザーエージェント", "useragentWarn":"再起動します。", + "frame": "ウィンドウのフレーム", + "frameWarn": "フレーム無しだと、タイトルバーのデザインがクールになります。再起動します。", "absolute": "絶対指定", "srcUrl": "検索エンジン", "srcUrlWarn": "{q}が検索文字列に置換されます。", diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 65b4ceec..7cd46b36 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -1,5 +1,5 @@ - + Settings - TheDesk @@ -25,6 +25,9 @@ .pcr-result { height: 1rem !important; } + .container-after-titlebar { + padding: 20px; + } @@pwa@@ diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js index e8bfe470..61812942 100644 --- a/app/view/make/setting.sample.js +++ b/app/view/make/setting.sample.js @@ -142,6 +142,26 @@ var envConstruction = [ desc: '@@srcUrlWarn@@', after: '' } + }, + { + id: 'frame', + storage: 'frame', + checkbox: true, + setValue: true, + text: { + head: '@@frame@@', + desc: '@@frameWarn@@', + checkbox: [ + { + text: '@@show@@', + value: 'true' + }, + { + text: '@@hide@@', + value: 'false' + } + ] + } } ] var tlConstruction = [ From 0af7e1da9fc0d18d246243cd67f2a434b549e4b4 Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 19 Mar 2020 22:19:04 +0900 Subject: [PATCH 06/21] New translations setting.json (Russian) (#245) --- app/view/make/language/ru-RU/setting.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/view/make/language/ru-RU/setting.json b/app/view/make/language/ru-RU/setting.json index be36af65..dca1ba4b 100644 --- a/app/view/make/language/ru-RU/setting.json +++ b/app/view/make/language/ru-RU/setting.json @@ -87,7 +87,7 @@ "mouseover": "Hide action buttons without mouseover", "mouseoverwarn": "You may feel 'mouseover' is unconfortable:(", "mv": "Mouseover to show", - "mvclick": "Click to show", + "mvclick": "Нажмите, чтобы показать", "notfmarker": "Show Notification marker, red colored bell and counter(if you show a notification column.)", "autofold": "Auto folding", "autofoldwarn": "TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.", @@ -103,7 +103,7 @@ "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.", "remote_img": "Get images from the remote server", "remote_imgWarn": "All previews are got from your loginned cache server.", - "replySound": "Sound(Reply)", + "replySound": "Звук (Ответить)", "favSound": "Звук(Fav)", "btSound": "Звук(Boost)", "followSound": "Звук(Подписаться)", From b03b387707c060474fc521694e47238b15fbad84 Mon Sep 17 00:00:00 2001 From: cutls Date: Thu, 19 Mar 2020 13:58:15 +0900 Subject: [PATCH 07/21] TheDesk 20.2.0 (Usamin) --- app/package.json | 2 +- app/view/make/index.sample.html | 43 ++++++--------------------------- app/view/make/make.js | 2 +- 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/app/package.json b/app/package.json index cf877659..7fdf3a4b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "20.1.2", + "version": "20.2.0", "description": "TheDesk is a Mastodon client for PC.", "repository": "https://github.com/cutls/TheDesk", "main": "main.js", diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 431ea2da..49a25c99 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -1189,47 +1189,20 @@ HP
GitHub

-