From 3f59355653dd4d8612bc7b0fca8509e5bb9a2cb7 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 13:46:48 +0200 Subject: New translations en-US.json (Chinese Traditional) --- src/i18n/locales/zh-Hant.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json index 678554c05..ffaa0a3c5 100644 --- a/src/i18n/locales/zh-Hant.json +++ b/src/i18n/locales/zh-Hant.json @@ -54,6 +54,7 @@ "locked.invalidCredentials": "Password invalid", "locked.password.label": "Password", "locked.submit.label": "Unlock", + "login.changeServer": "Change server", "login.customServerQuestion": "Using a custom Ferdi server?", "login.customServerSuggestion": "Try importing your Franz account", "login.email.label": "電子郵件信箱", @@ -186,6 +187,7 @@ "services.getStarted": "開始使用", "services.login": "Please login to use Ferdi.", "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", + "services.serverless": "Use Ferdi without an Account", "services.welcome": "歡迎使用 Ferdi", "settings.account.account.editButton": "更改帳戶資訊", "settings.account.accountType.basic": "基本帳戶", @@ -354,6 +356,8 @@ "settings.team.headline": "Team", "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", "settings.team.manageAction": "Manage your Team on getferdi.com", + "settings.team.teamsUnavailable": "Teams are unavailable", + "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "settings.team.upgradeAction": "Upgrade your Account", "settings.user.form.accountType.company": "公司", "settings.user.form.accountType.individual": "個人", -- cgit v1.2.3-70-g09d2 From 2dcd1ee5a6efb1bd678ef8e65f2585f4c1a56a0b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 13:46:59 +0200 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 594a009aa..b08da171c 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -356,8 +356,8 @@ "settings.team.headline": "Équipe", "settings.team.intro": "Vous et votre équipes utilise Ferdi? Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.", "settings.team.manageAction": "Gère ton équipe sur getferdi.com", - "settings.team.teamsUnavailable": "Les équipes sont indisponibles", - "settings.team.teamsUnavailableInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.", + "settings.team.teamsUnavailable": "Teams are unavailable", + "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "settings.team.upgradeAction": "Améliorez votre compte", "settings.user.form.accountType.company": "Entreprise", "settings.user.form.accountType.individual": "Individuel", -- cgit v1.2.3-70-g09d2 From 22803c31cfe690e84fb455ee0bcf9e90d46e61ce Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 13:47:04 +0200 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index aef231f05..99267726d 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -356,8 +356,8 @@ "settings.team.headline": "Team", "settings.team.intro": "Mit Ferdi für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.", "settings.team.manageAction": "Verwalte dein Team auf getferdi.com", - "settings.team.teamsUnavailable": "Teams sind nicht verfügbar", - "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar. \nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.", + "settings.team.teamsUnavailable": "Teams are unavailable", + "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "settings.team.upgradeAction": "Account Upgrade durchführen", "settings.user.form.accountType.company": "Firma", "settings.user.form.accountType.individual": "Einzelperson", -- cgit v1.2.3-70-g09d2 From c73ec686fa7ef8d8d0ddbd07347612391c2e6b5f Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 15:45:40 +0200 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index b08da171c..594a009aa 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -356,8 +356,8 @@ "settings.team.headline": "Équipe", "settings.team.intro": "Vous et votre équipes utilise Ferdi? Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.", "settings.team.manageAction": "Gère ton équipe sur getferdi.com", - "settings.team.teamsUnavailable": "Teams are unavailable", - "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", + "settings.team.teamsUnavailable": "Les équipes sont indisponibles", + "settings.team.teamsUnavailableInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.", "settings.team.upgradeAction": "Améliorez votre compte", "settings.user.form.accountType.company": "Entreprise", "settings.user.form.accountType.individual": "Individuel", -- cgit v1.2.3-70-g09d2 From 79b8c425360a2594d42c424106c1bcebd74039bc Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:37 +0200 Subject: New translations en-US.json (Afrikaans) --- src/i18n/locales/af.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From a1716b439b8d0d1d78e008163216e7d918aa631b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:40 +0200 Subject: New translations en-US.json (Romanian) --- src/i18n/locales/ro.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From d979849192bb6c04839729f33dbfa0558bbc11d2 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:42 +0200 Subject: New translations en-US.json (Japanese) --- src/i18n/locales/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index afda9ca1c..49c886dc6 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "キャッシュ", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Ferdiの翻訳作業にご協力をお願いします。", -- cgit v1.2.3-70-g09d2 From 66117f95bac5c0c0d49c91ddbfc5eb1869423ed6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:45 +0200 Subject: New translations en-US.json (Korean) --- src/i18n/locales/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 2a245fc902eaae13ef0844d4e78e3eaf4a17d506 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:47 +0200 Subject: New translations en-US.json (Norwegian) --- src/i18n/locales/no.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 9dda359952533c9b7c07cad02d6e0aa9d536c56e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:49 +0200 Subject: New translations en-US.json (Polish) --- src/i18n/locales/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index 85dde2229..6b4eb7d6e 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Pamięć podręczna", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Pomóż nam tłumaczyć Ferdi na Twój język.", -- cgit v1.2.3-70-g09d2 From 2536b1df19dd0025889d3aa1f66da8407cb317f4 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:52 +0200 Subject: New translations en-US.json (Portuguese) --- src/i18n/locales/pt-BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 0b8a51750..3d16482c9 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "memória cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Ajude-nos a traduzir o Ferdi para seu idioma.", -- cgit v1.2.3-70-g09d2 From 58ce5748d7d4c35d912c7a697c2a083cb66ec262 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:55 +0200 Subject: New translations en-US.json (Portuguese, Brazilian) --- src/i18n/locales/pt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 8948f223a..175322720 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Ajude-nos a traduzir a Ferdi para a sua língua.", -- cgit v1.2.3-70-g09d2 From fccae51bf1166448a6263e48124983a489143a17 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:57 +0200 Subject: New translations en-US.json (Russian) --- src/i18n/locales/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 557cf0de6..c1ae5cafd 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Кэш", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Помогите нам перевести Ferdi на ваш язык.", -- cgit v1.2.3-70-g09d2 From bbd980a1a222845424392dbb321fb53750ca7137 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:36:59 +0200 Subject: New translations en-US.json (Irish) --- src/i18n/locales/ga.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index aa86fe6d1..acd72ee0b 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Taisce", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Cabhraigh linn Ferdi a aistriú i do theanga.", -- cgit v1.2.3-70-g09d2 From 7fea7a4c671071d3166677cb89915b656a96db98 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:01 +0200 Subject: New translations en-US.json (Serbian (Cyrillic)) --- src/i18n/locales/sr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index 8493077bb..97ec48859 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Кеш", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ", -- cgit v1.2.3-70-g09d2 From 9137169dad0ae528745afcb9e7113ad9e412e87c Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:03 +0200 Subject: New translations en-US.json (Slovak) --- src/i18n/locales/sk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index 398f4c85a..aa8c65005 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Vyrovnávacia pamäť", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Pomôžte nám preložiť Ferdi do svojho jazyka.", -- cgit v1.2.3-70-g09d2 From 560020c5889ad0aa0648b04b92b32bacfd5716be Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:05 +0200 Subject: New translations en-US.json (Slovenian) --- src/i18n/locales/sl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From c5ccb0517e4caf8e8f0c6274077b8082339ce9ba Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:09 +0200 Subject: New translations en-US.json (Spanish) --- src/i18n/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 86a2256f0..178dcfc51 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Caché", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.", -- cgit v1.2.3-70-g09d2 From 66c7dc024ddf9a972354e37b4d239d410b252fa4 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:10 +0200 Subject: New translations en-US.json (Swedish) --- src/i18n/locales/sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 0d445ca81f72440bb4d0c4b3bcc4cc355f380ad5 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:12 +0200 Subject: New translations en-US.json (Turkish) --- src/i18n/locales/tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 734e8a2dd..1fd54a50d 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Önbellek", "settings.app.todoServerInfo": "Bu sunucu \"Ferdi Yapılacaklar Listesi\" özelliği için kullanılacakdır. (varsayılan: https://app.franztodos.com)", "settings.app.translationHelp": "Ferdi'ı senin diline tercüme etmemiz için yardım et.", -- cgit v1.2.3-70-g09d2 From 90851cb5a7429e72e7ffe2a863c38eab2b48c02b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:15 +0200 Subject: New translations en-US.json (Ukrainian) --- src/i18n/locales/uk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index d0525983f..d6da96961 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Кеш", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Допоможіть перекласти Ferdi на Вашу мову.", -- cgit v1.2.3-70-g09d2 From cc52bc0fbe84e237ae961e1d8d6baaf90dbe6b3e Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:17 +0200 Subject: New translations en-US.json (Italian) --- src/i18n/locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index d6f6549da..9a49fb6ce 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Aiutaci a tradurre Ferdi nella tua lingua.", -- cgit v1.2.3-70-g09d2 From 7705c1865ea71b706d31bab0ffe4273e261e4ec3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:19 +0200 Subject: New translations en-US.json (Indonesian) --- src/i18n/locales/id.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index aa1cc6463..dcbd826c3 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Singgahan", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Bantu kami menerjemahkan Ferdi ke bahasa Anda.", -- cgit v1.2.3-70-g09d2 From 03c153803fc2371587f1303261fa7e01aa444a26 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:21 +0200 Subject: New translations en-US.json (Arabic) --- src/i18n/locales/ar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From ecf3b778419c8ff1c734bc0efad09fcd3f89d932 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:23 +0200 Subject: New translations en-US.json (Danish) --- src/i18n/locales/da.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 98989267fbeb7966379d88bee96bc374f4845908 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:25 +0200 Subject: New translations en-US.json (Bosnian) --- src/i18n/locales/bs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 260a6923ee8ff65c18883f2133afc626d06bbd2b Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:28 +0200 Subject: New translations en-US.json (Catalan) --- src/i18n/locales/ca.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index 41aaf37a3..2c8696f8e 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Memòria cau", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Ajuda'ns a traduir Ferdi en la teva llengua.", -- cgit v1.2.3-70-g09d2 From e550ec8ef32af0b5c348572e0e1dc785c6291943 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:30 +0200 Subject: New translations en-US.json (Chinese Simplified) --- src/i18n/locales/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 2d118900d57f95c120098d8e8b9194eed4495dff Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:31 +0200 Subject: New translations en-US.json (Chinese Traditional) --- src/i18n/locales/zh-Hant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json index ffaa0a3c5..899591ab0 100644 --- a/src/i18n/locales/zh-Hant.json +++ b/src/i18n/locales/zh-Hant.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 37a3adde41f9fe3be3c40ef30a1847ebfb8dffcf Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:33 +0200 Subject: New translations en-US.json (Croatian) --- src/i18n/locales/hr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index a0d5bc659..94ea0582d 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Predmemorija", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Pomozite nam prevesti aplikaciju na Vaš jezik. ", -- cgit v1.2.3-70-g09d2 From 44032f15b97af1c803166582618f1c3adf4a02e0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:35 +0200 Subject: New translations en-US.json (Czech) --- src/i18n/locales/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index 7f9b29c8a..cd4b7bfcd 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Mezipaměť", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Pomozte nám přeložit Ferdi do svého jazyka.", -- cgit v1.2.3-70-g09d2 From 4ea2dfc943cc7cf71609e45a70ea451ad61268d6 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:37 +0200 Subject: New translations en-US.json (Dutch) --- src/i18n/locales/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index dab8545c9..af26ffa1e 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help ons om Ferdi uw taal te laten spreken.", -- cgit v1.2.3-70-g09d2 From 724392071bf8643049d6a2817b622729ecec0ec9 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:39 +0200 Subject: New translations en-US.json (Hungarian) --- src/i18n/locales/hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index cce492d56..83d454eec 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Gyorsítótár", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Segíts nekünk a Ferdi-ot lefordítani a nyelvedre.", -- cgit v1.2.3-70-g09d2 From bab289f6ebf1c278529e009bdd093de08176fc39 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:42 +0200 Subject: New translations en-US.json (Finnish) --- src/i18n/locales/fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 3bbed910a1b102bbab3159fc58dc583d6b1a8bc0 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:44 +0200 Subject: New translations en-US.json (Flemish) --- src/i18n/locales/nl-BE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index 1176d0f00..dda3e65f5 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help ons om Ferdi te vertalen naar uw taal.", -- cgit v1.2.3-70-g09d2 From de7ff3de884132d3572dcd9691d8b704b0773f95 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:45 +0200 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 594a009aa..3f2e04722 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.", "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.", "settings.app.serverInfo": "On vous recommande de vous déconnecter après d'avoir changer votre serveur dans vos paramètres au risque que les paramètres ne sois pas sauvegarder.", - "settings.app.serverMoneyInfo": "Vous êtes entrain d'utilisé le serveur officiel de Franz pour Ferdi.\nNous savons que Ferdi vous permet d'utilisé toutes les fonctionnalités gratuitement mais vous êtes toujours entrain d'utilisé les resources des serveurs de Franz - dont les créateurs paient pour.\nS'il vous plaît [Link 1]payé pour un compte Franz[/Link] ou [Link 2]utilisé un ferdi-serveur hébergé soi-même[/Link] (si vous avez la connaissance et les resources pour).\nEn utilisant Ferdi, vous profité beaucoup des recettes de Franz, resources serveurs et son développement.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "Ce serveur va être utilisé pour la fonction \"Ferdi Todo\". (défaut: https://app.franztodos.com)", "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.", -- cgit v1.2.3-70-g09d2 From 559c62945e3038a3d688e39f1993ecd5dfe29b2d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:48 +0200 Subject: New translations en-US.json (Georgian) --- src/i18n/locales/ka.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 3878f8eeb..0065b1b56 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 32c83f5957829aae5a9eb87841b6ad40ddd7beb3 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:50 +0200 Subject: New translations en-US.json (German) --- src/i18n/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 99267726d..6b7ac8a35 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.", "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.", "settings.app.serverInfo": "Wir empfehlen dir, dich nach dem Ändern des Servers abzumelden, da Ihre Einstellungen möglicherweise sonst nicht auf dem Server gespeichert werden können.", - "settings.app.serverMoneyInfo": "Du verwenden den offiziellen Franz Server für Ferdi.\nWir wissen, dass Ferdi es dir erlaubt, alle Funktionen kostenlos zu nutzen, aber du verwendest immer noch Franz's Serverressourcen - für die Franz's Entwickler zahlen müssen.\nBitte überlege dir, [Link 1]für ein Franz Premium-Account zu zahlen[/Link] oder [Link 2]dir einen eigene Server einzurichten[/Link] (wenn du das Wissen und die Ressourcen dazu hast). \nDurch die Nutzung von Ferdi profitieren Sie noch immer stark von Franz's Diensten, Serverressourcen und seiner Entwicklung.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "Dieser Server wird für die Funktion \"Ferdi Todo\" verwendet. (Standard: https://app.franztodos.com)", "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.", @@ -356,8 +356,8 @@ "settings.team.headline": "Team", "settings.team.intro": "Mit Ferdi für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.", "settings.team.manageAction": "Verwalte dein Team auf getferdi.com", - "settings.team.teamsUnavailable": "Teams are unavailable", - "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", + "settings.team.teamsUnavailable": "Teams sind nicht verfügbar", + "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar.\nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.", "settings.team.upgradeAction": "Account Upgrade durchführen", "settings.user.form.accountType.company": "Firma", "settings.user.form.accountType.individual": "Einzelperson", -- cgit v1.2.3-70-g09d2 From 596e3ac087186dab6e62b216f8e0265585e3c654 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:52 +0200 Subject: New translations en-US.json (Greek) --- src/i18n/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index af4b990ec..e8c9d1aae 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Λανθάνουσα μνήμη", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Βοηθήστε μας να μεταφράσουμε το Ferdi στη δική σας γλώσσα.", -- cgit v1.2.3-70-g09d2 From 7f4f1fb9dda61157952c877e55a9184a2385a343 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:54 +0200 Subject: New translations en-US.json (Hebrew) --- src/i18n/locales/he.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 5917846835bb3a8e28ebb53d27cb0c082dd86514 Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:37:56 +0200 Subject: New translations en-US.json (Vietnamese) --- src/i18n/locales/vi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 2e3034367..628880d9f 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", -- cgit v1.2.3-70-g09d2 From 2c58c2e360f18b11474e168919d5df8fa4ad731d Mon Sep 17 00:00:00 2001 From: Ferdi Bot <56048320+FerdiBot@users.noreply.github.com> Date: Sun, 20 Oct 2019 18:46:25 +0200 Subject: New translations en-US.json (French) --- src/i18n/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 3f2e04722..508eb875e 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -265,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.", "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.", "settings.app.serverInfo": "On vous recommande de vous déconnecter après d'avoir changer votre serveur dans vos paramètres au risque que les paramètres ne sois pas sauvegarder.", - "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "Vous êtes entrain d'utilisé le serveur officiel de Franz pour Ferdi.\nNous savons que Ferdi vous permet d'utilisé toutes les fonctionnalités gratuitement mais vous êtes toujours entrain d'utilisé les resources des serveurs de Franz - dont les créateurs paient pour.\nS'il vous plaît [Link 1]payé pour un compte Franz[/Link] ou [Link 2]utilisé un ferdi-serveur hébergé par soi-même[/Link] (si vous avez la connaissance et les resources pour).\nEn utilisant Ferdi, vous profité beaucoup des recettes de Franz, resources serveurs et son développement.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "Ce serveur va être utilisé pour la fonction \"Ferdi Todo\". (défaut: https://app.franztodos.com)", "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.", -- cgit v1.2.3-70-g09d2 From 69cf74a58b9dc539d53a484e6eadca73fa9accf9 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 21 Oct 2019 16:46:11 +0700 Subject: #145 Review development instructions --- README.md | 41 +++++++++++++++++++++++++++++++---------- docs/linux.md | 11 ----------- 2 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 docs/linux.md diff --git a/README.md b/README.md index 3595ee68a..1775fdb65 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,27 @@ You can find the installers in the [latest release](https://github.com/getferdi/ ### Preparations +#### Install OS dependencies + +##### Debian/Ubuntu + +```bash +$ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev +``` + +##### Fedora + +```bash +$ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel +``` + +##### Windows + +```bash +$ npm install --global windows-build-tools // Windows 10 +$ npm install --global windows-build-tools --vs2015 // Windows 7 +``` + #### Clone repository with submodule ```bash @@ -62,13 +83,11 @@ $ cd getferdi $ git submodule update --init --recursive ``` -#### Install Linux OS dependencies - -[Guide: Linux distribution specific dependencies](docs/linux.md) +It is important you execute the last command to get the required submodules (recipes, server). #### Use right NodeJS version -Please make sure you are running NodeJS v10 (v10.16.3 suggested). Versions above will throw an errow when trying to install due to an [old fsevent dependency](https://github.com/fsevents/fsevents/issues/278) +Please make sure you are running NodeJS v10 (v10.16.3 suggested). Versions above will throw an errow when trying to install due to an [old fsevent dependency](https://github.com/fsevents/fsevents/issues/278). #### Fix native modules to match current electron node version @@ -78,7 +97,7 @@ $ npm run rebuild ### Install dependencies -Run the following command to install all dependencies, and link sibling modules with Franz. +Run the following command to install all dependencies, and link sibling modules with Ferdi. ```bash $ npx lerna bootstrap @@ -86,9 +105,9 @@ $ npx lerna bootstrap If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. -### Run Ferdi Development App +### Start development app -Run these two commands **simultaneously** in different console tabs. +Run these two commands **simultaneously** in different console tabs: ```bash $ npm run dev @@ -97,7 +116,7 @@ $ npm run start Be aware that the development database will be reset regularly. -## Packaging +### Packaging ```bash $ npm run build @@ -105,14 +124,16 @@ $ npm run build Deliverables will be available in the `out` folder. -## Release +### Release ```bash +$ git checkout develop && git pull && git checkout master +$ git merge --no-ff develop $ git tag v5.3.4-beta.4 $ git push --tags ``` -When pushing a new tag, the CI build will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release. +When pushing a new tag, the CI builds will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release. ## Contributors ✨ diff --git a/docs/linux.md b/docs/linux.md deleted file mode 100644 index 43ffa313b..000000000 --- a/docs/linux.md +++ /dev/null @@ -1,11 +0,0 @@ -# Linux distribution specific dependencies - -## Debian/Ubuntu -```bash -$ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev -``` - -## Fedora -```bash -$ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel -``` -- cgit v1.2.3-70-g09d2 From bda3a726948e5c3bfc62f1910b88821c8d8e37e6 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 21 Oct 2019 17:01:21 +0700 Subject: Fix case sensitive conflict on locale file --- src/i18n/locales/zh-HANT.json | 6 +- src/i18n/locales/zh-Hant.json | 448 ------------------------------------------ 2 files changed, 5 insertions(+), 449 deletions(-) delete mode 100644 src/i18n/locales/zh-Hant.json diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index 678554c05..899591ab0 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -54,6 +54,7 @@ "locked.invalidCredentials": "Password invalid", "locked.password.label": "Password", "locked.submit.label": "Unlock", + "login.changeServer": "Change server", "login.customServerQuestion": "Using a custom Ferdi server?", "login.customServerSuggestion": "Try importing your Franz account", "login.email.label": "電子郵件信箱", @@ -186,6 +187,7 @@ "services.getStarted": "開始使用", "services.login": "Please login to use Ferdi.", "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", + "services.serverless": "Use Ferdi without an Account", "services.welcome": "歡迎使用 Ferdi", "settings.account.account.editButton": "更改帳戶資訊", "settings.account.accountType.basic": "基本帳戶", @@ -263,7 +265,7 @@ "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.", + "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", "settings.app.translationHelp": "Help us to translate Ferdi into your language.", @@ -354,6 +356,8 @@ "settings.team.headline": "Team", "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", "settings.team.manageAction": "Manage your Team on getferdi.com", + "settings.team.teamsUnavailable": "Teams are unavailable", + "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "settings.team.upgradeAction": "Upgrade your Account", "settings.user.form.accountType.company": "公司", "settings.user.form.accountType.individual": "個人", diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json deleted file mode 100644 index 899591ab0..000000000 --- a/src/i18n/locales/zh-Hant.json +++ /dev/null @@ -1,448 +0,0 @@ -{ - "app.errorHandler.action": "Reload", - "app.errorHandler.headline": "Something went wrong", - "feature.announcements.changelog.headline": "Changes in Ferdi {version}", - "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting", - "feature.delayApp.text": "Ferdi will continue in {seconds} seconds.", - "feature.delayApp.trial.action": "Yes, I want the free 14 day trial of Ferdi Professional", - "feature.delayApp.trial.actionShort": "Activate the free Ferdi Professional trial", - "feature.delayApp.trial.headline": "Get the free Ferdi Professional 14 day trial and skip the line", - "feature.delayApp.upgrade.action": "Get a Ferdi Supporter License", - "feature.delayApp.upgrade.actionShort": "Upgrade account", - "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", - "feature.quickSwitch.search": "Search...", - "feature.quickSwitch.title": "QuickSwitch", - "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.", - "feature.shareFranz.action.email": "Send as email", - "feature.shareFranz.action.facebook": "Share on Facebook", - "feature.shareFranz.action.twitter": "Share on Twitter", - "feature.shareFranz.headline": "Ferdi is better together!", - "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com", - "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger", - "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.", - "feature.todos.premium.info": "Ferdi Todos are available to premium users now!", - "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.", - "feature.todos.premium.upgrade": "Upgrade Account", - "global.api.unhealthy": "無法連接到Ferdi網路服務", - "global.franzProRequired": "Ferdi Professional Required", - "global.notConnectedToTheInternet": "您未連上網際網路", - "global.spellchecker.useDefault": "Use System Default ({default})", - "global.spellchecking.autodetect": "Detect language automatically", - "global.spellchecking.autodetect.short": "Automatic", - "global.spellchecking.language": "Spell checking language", - "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional", - "import.headline": "匯入您的 Ferdi 4 服務", - "import.notSupportedHeadline": "此服務不被 Ferdi 5 支持", - "import.skip.label": "我想手動匯入", - "import.submit.label": "匯入服務", - "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", - "infobar.buttonChangelog": "What is new?", - "infobar.buttonInstallUpdate": "重新啟動並且更新", - "infobar.buttonReloadServices": "重新載入", - "infobar.requiredRequestsFailed": "無法載入服務與帳戶資訊", - "infobar.servicesUpdated": "您的服務已更新", - "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!", - "infobar.updateAvailable": "有新的更新可安裝", - "invite.email.label": "電子郵件信箱", - "invite.headline.friends": "邀請三個人", - "invite.name.label": "名子", - "invite.skip.label": "我想晚點進行", - "invite.submit.label": "Send invites", - "invite.successInfo": "Invitations sent successfully", - "locked.headline": "Locked", - "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", - "locked.invalidCredentials": "Password invalid", - "locked.password.label": "Password", - "locked.submit.label": "Unlock", - "login.changeServer": "Change server", - "login.customServerQuestion": "Using a custom Ferdi server?", - "login.customServerSuggestion": "Try importing your Franz account", - "login.email.label": "電子郵件信箱", - "login.headline": "登入", - "login.invalidCredentials": "電子郵件帳戶或密碼有誤", - "login.link.password": "密碼重設", - "login.link.signup": "建立一個免費帳戶", - "login.password.label": "Password", - "login.serverLogout": "登入狀態過期，請重新登入", - "login.submit.label": "登入", - "login.tokenExpired": "登入狀態過期，請重新登入", - "menu.Todoss.closeTodosDrawer": "Close Todos drawer", - "menu.Todoss.openTodosDrawer": "Open Todos drawer", - "menu.app.about": "About Ferdi", - "menu.app.announcement": "What's new?", - "menu.app.autohideMenuBar": "Auto-hide menu bar", - "menu.app.checkForUpdates": "Check for updates", - "menu.app.hide": "Hide", - "menu.app.hideOthers": "Hide Others", - "menu.app.quit": "Quit", - "menu.app.settings": "Settings", - "menu.app.unhide": "Unhide", - "menu.edit": "Edit", - "menu.edit.copy": "Copy", - "menu.edit.cut": "Cut", - "menu.edit.delete": "Delete", - "menu.edit.emojiSymbols": "Emoji & Symbols", - "menu.edit.paste": "Paste", - "menu.edit.pasteAndMatchStyle": "Paste And Match Style", - "menu.edit.redo": "Redo", - "menu.edit.selectAll": "Select All", - "menu.edit.speech": "Speech", - "menu.edit.startDictation": "Start Dictation", - "menu.edit.startSpeaking": "Start Speaking", - "menu.edit.stopSpeaking": "Stop Speaking", - "menu.edit.undo": "Undo", - "menu.file": "File", - "menu.help": "Help", - "menu.help.changelog": "Changelog", - "menu.help.debugInfo": "Copy Debug Information", - "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.", - "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information", - "menu.help.learnMore": "Learn More", - "menu.help.privacy": "Privacy Statement", - "menu.help.support": "Support", - "menu.help.tos": "Terms of Service", - "menu.services": "Services", - "menu.services.activatePreviousService": "Activate previous service", - "menu.services.addNewService": "Add New Service...", - "menu.services.goHome": "Home", - "menu.services.setNextServiceActive": "Activate next service", - "menu.todos": "Todos", - "menu.todos.enableTodos": "Enable Todos", - "menu.view": "View", - "menu.view.back": "Back", - "menu.view.enterFullScreen": "Enter Full Screen", - "menu.view.exitFullScreen": "Exit Full Screen", - "menu.view.forward": "Forward", - "menu.view.lockFerdi": "Lock Ferdi", - "menu.view.openQuickSwitch": "Open Quick Switch", - "menu.view.reloadFranz": "Reload Ferdi", - "menu.view.reloadService": "Reload Service", - "menu.view.resetZoom": "Actual Size", - "menu.view.toggleDevTools": "Toggle Developer Tools", - "menu.view.toggleFullScreen": "Toggle Full Screen", - "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools", - "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools", - "menu.view.zoomIn": "Zoom In", - "menu.view.zoomOut": "Zoom Out", - "menu.window": "Window", - "menu.window.close": "Close", - "menu.window.minimize": "Minimize", - "menu.workspaces": "Workspaces", - "menu.workspaces.addNewWorkspace": "Add New Workspace...", - "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer", - "menu.workspaces.defaultWorkspace": "All services", - "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer", - "password.email.label": "電子郵件信箱", - "password.headline": "密碼重設", - "password.link.login": "登入您的帳戶", - "password.link.signup": "建立一個免費帳戶", - "password.noUser": "此電子郵件帳戶不存在", - "password.submit.label": "送出", - "password.successInfo": "請重新確認您的電子郵件信箱", - "premiumFeature.button.upgradeAccount": "Upgrade account", - "pricing.features.adFree": "Forever ad-free", - "pricing.features.appDelays": "No Waiting Screens", - "pricing.features.customWebsites": "Add Custom Websites", - "pricing.features.onPremise": "On-premise & other Hosted Services", - "pricing.features.serviceProxies": "Service Proxies", - "pricing.features.spellchecker": "Spellchecker support", - "pricing.features.teamManagement": "Team Management", - "pricing.features.thirdPartyServices": "Install 3rd party services", - "pricing.features.unlimitedServices": "Add unlimited services", - "pricing.features.workspaces": "Workspaces", - "pricing.plan.free": "Ferdi Free", - "pricing.plan.legacy": "Ferdi Premium", - "pricing.plan.personal": "Ferdi Personal", - "pricing.plan.personal-monthly": "Ferdi Personal Monthly", - "pricing.plan.personal-yearly": "Ferdi Personal Yearly", - "pricing.plan.pro": "Ferdi Professional", - "pricing.plan.pro-monthly": "Ferdi Professional Monthly", - "pricing.plan.pro-yearly": "Ferdi Professional Yearly", - "pricing.trial.cta.accept": "Yes, upgrade my account to Ferdi Professional", - "pricing.trial.cta.skip": "Continue to Ferdi", - "pricing.trial.error": "Sorry, we could not activate your trial!", - "pricing.trial.features.headline": "Ferdi Professional includes:", - "pricing.trial.headline": "Ferdi Professional", - "pricing.trial.subheadline": "Your personal welcome offer:", - "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days", - "pricing.trial.terms.headline": "No strings attached", - "pricing.trial.terms.noCreditCard": "No credit card required", - "service.crashHandler.action": "Reload {name}", - "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds", - "service.crashHandler.headline": "Oh no!", - "service.crashHandler.text": "{name} has caused an error.", - "service.disabledHandler.action": "Enable {name}", - "service.disabledHandler.headline": "{name} is disabled", - "service.errorHandler.action": "Reload {name}", - "service.errorHandler.editAction": "Edit {name}", - "service.errorHandler.headline": "Oh no!", - "service.errorHandler.message": "Error", - "service.errorHandler.text": "{name} has failed to load.", - "service.restrictedHandler.action": "Upgrade Account", - "service.restrictedHandler.customUrl.headline": "Ferdi Professional Plan required", - "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.", - "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.", - "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.", - "service.webviewLoader.loading": "Loading", - "services.getStarted": "開始使用", - "services.login": "Please login to use Ferdi.", - "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", - "services.serverless": "Use Ferdi without an Account", - "services.welcome": "歡迎使用 Ferdi", - "settings.account.account.editButton": "更改帳戶資訊", - "settings.account.accountType.basic": "基本帳戶", - "settings.account.accountType.premium": "Premium Supporter Account", - "settings.account.buttonSave": "更新帳戶資訊", - "settings.account.deleteAccount": "Delete account", - "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", - "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.", - "settings.account.headline": "帳戶", - "settings.account.headlineAccount": "帳戶資訊", - "settings.account.headlineDangerZone": "Danger Zone", - "settings.account.headlineInvoices": "Invoices", - "settings.account.headlinePassword": "更改密碼", - "settings.account.headlineProfile": "更新帳戶資訊", - "settings.account.headlineSubscription": "您的訂閱", - "settings.account.headlineTrialUpgrade": "Get the free 14 day Ferdi Professional Trial", - "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Ferdi experience", - "settings.account.invoiceDownload": "下載", - "settings.account.manageSubscription.label": "管理訂閱", - "settings.account.successInfo": "您的更改已經儲存", - "settings.account.trial": "Free Trial", - "settings.account.trialEndsIn": "Your free trial ends in {duration}.", - "settings.account.trialUpdateBillingInfo": "Please update your billing info to continue using {license} after your trial period.", - "settings.account.tryReloadServices": "Try again", - "settings.account.tryReloadUserInfoRequest": "Try again", - "settings.account.upgradeToPro.label": "Upgrade to Ferdi Professional", - "settings.account.userInfoRequestFailed": "無法載入帳戶資訊", - "settings.account.yourLicense": "Your Ferdi License", - "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)", - "settings.app.buttonClearAllCache": "Clear cache", - "settings.app.buttonInstallUpdate": "重新啟動並且更新", - "settings.app.buttonSearchForUpdate": "Check for updates", - "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", - "settings.app.currentVersion": "當前版本：", - "settings.app.form.accentColor": "Accent color", - "settings.app.form.autoLaunchInBackground": "背景啟動", - "settings.app.form.autoLaunchOnStart": "開機時啟動", - "settings.app.form.beta": "包含開發中版本", - "settings.app.form.darkMode": "Join the Dark Side", - "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", - "settings.app.form.enableSpellchecking": "Enable spell checking", - "settings.app.form.enableSystemTray": "在系統匣上顯示", - "settings.app.form.enableTodos": "Enable Ferdi Todos", - "settings.app.form.hibernate": "Enable service hibernation", - "settings.app.form.hibernationStrategy": "Hibernation strategy", - "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", - "settings.app.form.language": "語言", - "settings.app.form.lockPassword": "Ferdi Lock password", - "settings.app.form.minimizeToSystemTray": "最小化至系統匣", - "settings.app.form.noUpdates": "Disable updates", - "settings.app.form.privateNotifications": "Don't show message content in notifications", - "settings.app.form.runInBackground": "關閉時保持在背景運作", - "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", - "settings.app.form.scheduledDNDEnd": "To", - "settings.app.form.scheduledDNDStart": "From", - "settings.app.form.server": "Server", - "settings.app.form.showDisabledServices": "Display disabled services tabs", - "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", - "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", - "settings.app.form.todoServer": "Todo Server", - "settings.app.form.universalDarkMode": "Enable universal Dark Mode", - "settings.app.headline": "Settings", - "settings.app.headlineAdvanced": "Advanced", - "settings.app.headlineAppearance": "Appearance", - "settings.app.headlineGeneral": "一般", - "settings.app.headlineLanguage": "語言", - "settings.app.headlineUpdates": "更新", - "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", - "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", - "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", - "settings.app.restartRequired": "Changes require restart", - "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", - "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", - "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", - "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", - "settings.app.subheadlineCache": "Cache", - "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", - "settings.app.translationHelp": "Help us to translate Ferdi into your language.", - "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", - "settings.app.updateStatusAvailable": "有可用更新，下載中...", - "settings.app.updateStatusSearching": "檢查更新中...", - "settings.app.updateStatusUpToDate": "已經是最新版本了", - "settings.invite.headline": "Invite Friends", - "settings.navigation.account": "帳戶", - "settings.navigation.availableServices": "可用服務", - "settings.navigation.logout": "登出", - "settings.navigation.settings": "Settings", - "settings.navigation.supportFerdi": "Support Ferdi", - "settings.navigation.team": "Manage Team", - "settings.navigation.yourServices": "您的服務", - "settings.navigation.yourWorkspaces": "Your workspaces", - "settings.recipes.all": "All services", - "settings.recipes.custom": "Custom Services", - "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes", - "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes", - "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes", - "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:", - "settings.recipes.customService.openDevDocs": "Developer Documentation", - "settings.recipes.customService.openFolder": "Open folder", - "settings.recipes.headline": "可用服務", - "settings.recipes.missingService": "Missing a service?", - "settings.recipes.mostPopular": "熱門", - "settings.recipes.nothingFound": "抱歉，找不到您所要的服務", - "settings.recipes.servicesSuccessfulAddedInfo": "新增服務成功", - "settings.searchService": "Search service", - "settings.service.error.goBack": "返回", - "settings.service.error.headline": "Error", - "settings.service.error.message": "無法載入服務元件", - "settings.service.form.addServiceHeadline": "新增 {name}", - "settings.service.form.availableServices": "可用服務", - "settings.service.form.customUrl": "Custom server", - "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.", - "settings.service.form.customUrlUpgradeAccount": "升級帳戶", - "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", - "settings.service.form.deleteButton": "刪除", - "settings.service.form.editServiceHeadline": "Edit {name}", - "settings.service.form.enableAudio": "Enable audio", - "settings.service.form.enableBadge": "Show unread message badges", - "settings.service.form.enableDarkMode": "Enable Dark Mode", - "settings.service.form.enableNotification": "啟用通知", - "settings.service.form.enableService": "啟用服務", - "settings.service.form.headlineBadges": "Unread message badges", - "settings.service.form.headlineGeneral": "一般", - "settings.service.form.headlineNotifications": "Notifications", - "settings.service.form.icon": "Custom icon", - "settings.service.form.iconDelete": "Delete", - "settings.service.form.iconUpload": "Drop your image, or click here", - "settings.service.form.indirectMessageInfo": "除了 @username, @channel, @here 之外，當您參與的頻道有訊息時，就會通知", - "settings.service.form.indirectMessages": "針對全部訊息顯示通知", - "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", - "settings.service.form.name": "名子", - "settings.service.form.openDarkmodeCss": "Open darkmode.css", - "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings", - "settings.service.form.proxy.host": "Proxy Host/IP", - "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.", - "settings.service.form.proxy.isEnabled": "Use Proxy", - "settings.service.form.proxy.password": "Password (optional)", - "settings.service.form.proxy.port": "Port", - "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.", - "settings.service.form.proxy.user": "User (optional)", - "settings.service.form.saveButton": "儲存", - "settings.service.form.tabHosted": "Hosted", - "settings.service.form.tabOnPremise": "Self hosted ⭐️", - "settings.service.form.team": "Team", - "settings.service.form.useHostedService": "Use the hosted {name} service.", - "settings.service.form.yourServices": "您的服務", - "settings.services.deletedInfo": "服務已刪除", - "settings.services.discoverServices": "服務列表", - "settings.services.headline": "您的服務", - "settings.services.noServicesAdded": "您還沒加入任何服務", - "settings.services.servicesRequestFailed": "Could not load your services", - "settings.services.tooltip.isDisabled": "已停用服務", - "settings.services.tooltip.isMuted": "All sounds are muted", - "settings.services.tooltip.notificationsDisabled": "已停用通知", - "settings.services.updatedInfo": "您的更改已經儲存", - "settings.supportFerdi.github": "Star on GitHub", - "settings.supportFerdi.headline": "Support Ferdi", - "settings.supportFerdi.openCollective": "Support our Open Collective", - "settings.supportFerdi.share": "Tell your Friends", - "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!", - "settings.team.contentHeadline": "Ferdi for Teams", - "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!", - "settings.team.headline": "Team", - "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", - "settings.team.manageAction": "Manage your Team on getferdi.com", - "settings.team.teamsUnavailable": "Teams are unavailable", - "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", - "settings.team.upgradeAction": "Upgrade your Account", - "settings.user.form.accountType.company": "公司", - "settings.user.form.accountType.individual": "個人", - "settings.user.form.accountType.label": "帳戶類型", - "settings.user.form.accountType.non-profit": "非營利", - "settings.user.form.currentPassword": "舊密碼", - "settings.user.form.email": "電子郵件信箱", - "settings.user.form.firstname": "名子", - "settings.user.form.lastname": "姓氏", - "settings.user.form.newPassword": "新密碼", - "settings.workspace.add.form.name": "名子", - "settings.workspace.add.form.submitButton": "Create workspace", - "settings.workspace.form.buttonDelete": "Delete workspace", - "settings.workspace.form.buttonSave": "Save workspace", - "settings.workspace.form.keepLoaded": "Keep this workspace loaded*", - "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.", - "settings.workspace.form.name": "名子", - "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace", - "settings.workspace.form.yourWorkspaces": "Your workspaces", - "settings.workspaces.deletedInfo": "Workspace has been deleted", - "settings.workspaces.headline": "Your workspaces", - "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.", - "settings.workspaces.tryReloadWorkspaces": "Try again", - "settings.workspaces.updatedInfo": "您的更改已經儲存", - "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces", - "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.", - "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces", - "sidebar.addNewService": "Add new service", - "sidebar.closeTodosDrawer": "Close Ferdi Todos", - "sidebar.closeWorkspaceDrawer": "Close workspace drawer", - "sidebar.lockFerdi": "Lock Ferdi", - "sidebar.muteApp": "Disable notifications & audio", - "sidebar.openTodosDrawer": "Open Ferdi Todos", - "sidebar.openWorkspaceDrawer": "Open workspace drawer", - "sidebar.settings": "Settings", - "sidebar.unmuteApp": "Enable notifications & audio", - "signup.email.label": "電子郵件信箱", - "signup.emailDuplicate": "此電子郵件信箱已被註冊", - "signup.firstname.label": "名子", - "signup.headline": "註冊", - "signup.lastname.label": "姓氏", - "signup.legal.info": "在建立帳戶同時，您同意：", - "signup.legal.privacy": "Privacy Statement", - "signup.legal.terms": "服務條款", - "signup.link.login": "您已有一個帳戶，請問是否要登入？", - "signup.password.label": "Password", - "signup.submit.label": "建立帳戶", - "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial", - "subscription.cta.allOptions": "See all options", - "subscription.cta.choosePlan": "Choose your plan", - "subscription.includedProFeatures": "The Ferdi Professional Plan includes:", - "subscription.teaser.includedFeatures": "Paid Ferdi Plans include:", - "subscription.teaser.intro": "Ferdi 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!", - "subscriptionPopup.buttonCancel": "取消", - "subscriptionPopup.buttonDone": "完成", - "tabs.item.deleteService": "刪除", - "tabs.item.disableAudio": "Disable audio", - "tabs.item.disableNotifications": "停用通知", - "tabs.item.disableService": "停用服務", - "tabs.item.edit": "Edit", - "tabs.item.enableAudio": "Enable audio", - "tabs.item.enableNotification": "啟用通知", - "tabs.item.enableService": "啟用服務", - "tabs.item.reload": "Reload", - "validation.email": "{field} is not valid", - "validation.minLength": "{field} should be at least {length} characters long", - "validation.oneRequired": "At least one is required", - "validation.required": "{field} is required", - "validation.url": "{field} is not a valid URL", - "webControls.back": "Back", - "webControls.forward": "Forward", - "webControls.goHome": "Home", - "webControls.openInBrowser": "Open in Browser", - "webControls.reload": "Reload", - "welcome.loginButton": "登入", - "welcome.signupButton": "建立一個免費帳戶", - "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace", - "workspaceDrawer.allServices": "All services", - "workspaceDrawer.headline": "Workspaces", - "workspaceDrawer.item.contextMenuEdit": "edit", - "workspaceDrawer.item.noServicesAddedYet": "No services added yet", - "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace", - "workspaceDrawer.proFeatureBadge": "Premium feature", - "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account", - "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", - "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", - "workspaces.switchingIndicator.switchingTo": "Switching to" -} -- cgit v1.2.3-70-g09d2 From 9724d4a3ad849cb688545946edb2e878e4a4efc4 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 21 Oct 2019 18:19:19 +0700 Subject: Fix more observers related warnings --- src/components/auth/Login.js | 2 +- src/components/auth/Signup.js | 2 +- src/components/auth/Welcome.js | 2 +- src/components/subscription/SubscriptionForm.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index e58016e25..e25121de0 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -70,7 +70,7 @@ const messages = defineMessages({ }, }); -export default @observer @inject('actions') class Login extends Component { +export default @inject('actions') @observer class Login extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 47e9daf18..a166155a7 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -74,7 +74,7 @@ const messages = defineMessages({ }, }); -export default @observer @inject('actions') class Signup extends Component { +export default @inject('actions') @observer class Signup extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 2ca8b430f..1453c1d7c 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -22,7 +22,7 @@ const messages = defineMessages({ }, }); -export default @observer @inject('actions') class Login extends Component { +export default @inject('actions') @observer class Login extends Component { static propTypes = { loginRoute: PropTypes.string.isRequired, signupRoute: PropTypes.string.isRequired, diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index cdfbbe60d..effd04f7a 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js @@ -34,7 +34,7 @@ const styles = () => ({ }, }); -export default @observer @injectSheet(styles) class SubscriptionForm extends Component { +export default @injectSheet(styles) @observer class SubscriptionForm extends Component { static propTypes = { selectPlan: PropTypes.func.isRequired, isActivatingTrial: PropTypes.bool.isRequired, -- cgit v1.2.3-70-g09d2 From 405100200dfec9d55f985ffae4bc70f10df44846 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 21 Oct 2019 18:38:33 +0700 Subject: Fine-tune git submodules config --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f1f9fcec8..d121d6c01 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,8 @@ [submodule "recipes"] path = recipes - url = https://github.com/getferdi/recipes + url = git@github.com:getferdi/recipes.git + ignore = all [submodule "src/server"] path = src/server - url = https://github.com/getferdi/internal-server.git + url = git@github.com:getferdi/internal-server.git + ignore = all -- cgit v1.2.3-70-g09d2