Merge branch 'develop' into develop

3 files changed, 172 insertions, 3 deletions

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index a7ed6de28..8777cf89a 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -11,4 +11,5 @@ module.exports = {
   ru: 'Русский',
   ua: 'Українська',
   'es-ES': 'Español - España',
+  'zh-Hant': 'Chinese (Traditional)',
 };
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 40cc14c50..39c2c1cc8 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -54,7 +54,7 @@
   "subscription.features.vpn": "Proxy & VPN ondersteuning",
   "subscription.features.ads": "Geen reclame, nooit!",
   "subscription.features.comingSoon": "komt binnenkort",
-  "infobar.servicesUpdated": "Je services zijn geüpdated.",
+  "infobar.servicesUpdated": "Je services zijn geüpdatet.",
   "infobar.updateAvailable": "Er is een nieuwe update van Franz beschikbaar.",
   "infobar.buttonReloadServices": "Services herladen",
   "infobar.buttonInstallUpdate": "Herstarten & update installeren",
@@ -76,7 +76,7 @@
   "settings.account.headlineProfile": "Profiel aanpassen",
   "settings.account.headlineAccount": "Accountinformatie",
   "settings.account.headlinePassword": "Wachtwoord veranderen",
-  "settings.account.successInfo": "Je wijzigingen werden bewaard",
+  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
   "settings.account.buttonSave": "Profiel aanpassen",
   "settings.account.mining.thankyou": "Bedankt om Franz te steunen met je rekenkracht.",
   "settings.account.mining.active": "Op dit moment maak je {hashes} berekeningen per seconde.",
@@ -113,7 +113,7 @@
   "settings.services.headline": "Jouw services",
   "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.",
   "settings.services.discoverServices": "Services ontdekken",
-  "settings.services.updatedInfo": "Je veranderingen werden bewaard",
+  "settings.services.updatedInfo": "Je wijzigingen werden bewaard",
   "settings.services.deletedInfo": "Service werd verwijderd",
   "settings.app.headline": "Instellingen",
   "settings.app.headlineGeneral": "Algemeen",
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
new file mode 100644
index 000000000..e52b9ca26
--- /dev/null
+++ b/src/i18n/locales/zh-Hant.json
@@ -0,0 +1,168 @@
+{
+  "global.api.unhealthy": "無法連接到Franz網路服務",
+  "global.notConnectedToTheInternet": "您未連上網際網路",
+  "welcome.signupButton": "建立一個免費帳戶",
+  "welcome.loginButton": "登入",
+  "welcome.slogan": "Messaging that works for you",
+  "login.headline": "登入",
+  "login.email.label": "電子郵件信箱",
+  "login.password.label": "密碼",
+  "login.submit.label": "登入",
+  "login.invalidCredentials": "電子郵件帳戶或密碼有誤",
+  "login.tokenExpired": "登入狀態過期，請重新登入",
+  "login.serverLogout": "登入狀態過期，請重新登入",
+  "login.link.signup": "建立一個免費帳戶",
+  "login.link.password": "密碼重設",
+  "password.headline": "密碼重設",
+  "password.email.label": "電子郵件信箱",
+  "password.submit.label": "送出",
+  "password.noUser": "此電子郵件帳戶不存在",
+  "password.successInfo": "請重新確認您的電子郵件信箱",
+  "password.link.signup": "建立一個免費帳戶",
+  "password.link.login": "登入您的帳戶",
+  "signup.headline": "註冊",
+  "signup.firstname.label": "名子",
+  "signup.lastname.label": "姓氏",
+  "signup.email.label": "電子郵件信箱",
+  "signup.company.label": "公司",
+  "signup.password.label": "密碼",
+  "signup.submit.label": "建立帳戶",
+  "signup.link.login": "您已有一個帳戶，請問是否要登入？",
+  "signup.emailDuplicate": "此電子郵件信箱已被註冊",
+  "signup.legal.info": "在建立帳戶同時，您同意：",
+  "signup.legal.terms": "服務條款",
+  "signup.legal.privacy": "隱私聲明",
+  "pricing.headline": "贊助 Franz",
+  "pricing.support.label": "選擇贊助方案",
+  "pricing.submit.label": "我想協助 Franz 的開發",
+  "pricing.link.skipPayment": "我不想協助 Franz 的開發",
+  "import.headline": "匯入您的 Franz 4 服務",
+  "import.notSupportedHeadline": "此服務不被 Franz 5 支持",
+  "import.submit.label": "匯入服務",
+  "import.skip.label": "我想手動匯入",
+  "invite.submit.label": "Send invites",
+  "invite.headline.friends": "邀請三個人",
+  "invite.name.label": "名子",
+  "invite.email.label": "電子郵件信箱",
+  "invite.skip.label": "我想晚點進行",
+  "subscription.submit.label": "我想協助 Franz 的開發",
+  "subscription.paymentSessionError": "無法初始化付費表單",
+  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
+  "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
+  "subscription.features.customServices": "Private services for you and your team",
+  "subscription.features.encryptedSync": "Encrypted session synchronization",
+  "subscription.features.vpn": "支援 Proxy & VPN",
+  "subscription.features.ads": "不再有任何廣告",
+  "subscription.features.comingSoon": "敬請期待",
+  "infobar.servicesUpdated": "您的服務已更新",
+  "infobar.updateAvailable": "有新的更新可安裝",
+  "infobar.buttonReloadServices": "重新載入",
+  "infobar.buttonInstallUpdate": "重新啟動並且更新",
+  "infobar.requiredRequestsFailed": "無法載入服務與帳戶資訊",
+  "sidebar.settings": "設定",
+  "services.welcome": "歡迎使用 Franz",
+  "services.getStarted": "開始使用",
+  "settings.account.headline": "帳戶",
+  "settings.account.headlineSubscription": "您的訂閱",
+  "settings.account.headlineUpgrade": "升級帳戶以及贊助 Franz",
+  "settings.account.headlineInvoices": "Invoices",
+  "settings.account.manageSubscription.label": "管理訂閱",
+  "settings.account.accountType.basic": "基本帳戶",
+  "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.account.editButton": "更改帳戶資訊",
+  "settings.account.invoiceDownload": "下載",
+  "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
+  "settings.account.tryReloadUserInfoRequest": "請重試",
+  "settings.account.headlineProfile": "更新帳戶資訊",
+  "settings.account.headlineAccount": "帳戶資訊",
+  "settings.account.headlinePassword": "更改密碼",
+  "settings.account.successInfo": "您的更改已經儲存",
+  "settings.account.buttonSave": "更新帳戶資訊",
+  "settings.account.mining.thankyou": "感謝您贊助運算能力",
+  "settings.account.mining.active": "您現在每秒執行 {hashes} 個計算",
+  "settings.account.mining.moreInformation": "取得更多資訊",
+  "settings.account.mining.cancel": "取消贊助運算",
+  "settings.navigation.availableServices": "可用服務",
+  "settings.navigation.yourServices": "您的服務",
+  "settings.navigation.account": "帳戶",
+  "settings.navigation.settings": "設定",
+  "settings.navigation.logout": "登出",
+  "settings.recipes.headline":  "可用服務",
+  "settings.recipes.mostPopular": "熱門",
+  "settings.recipes.all": "全部",
+  "settings.recipes.dev": "開發中",
+  "settings.recipes.nothingFound": "抱歉，找不到您所要的服務",
+  "settings.recipes.servicesSuccessfulAddedInfo": "新增服務成功",
+  "settings.service.form.saveButton": "儲存",
+  "settings.service.form.deleteButton": "刪除",
+  "settings.service.form.availableServices": "可用服務",
+  "settings.service.form.yourServices": "您的服務",
+  "settings.service.form.addServiceHeadline": "新增 {name}",
+  "settings.service.form.editServiceHeadline": "更改 {name}",
+  "settings.service.form.tabHosted": "Hosted",
+  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
+  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.",
+  "settings.service.form.customUrlUpgradeAccount": "升級帳戶",
+  "settings.service.form.indirectMessageInfo": "除了 @username, @channel, @here 之外，當您參與的頻道有訊息時，就會通知",
+  "settings.service.error.headline": "錯誤",
+  "settings.service.error.goBack": "返回",
+  "settings.service.error.message": "無法載入服務元件",
+  "settings.services.tooltip.isDisabled": "已停用服務",
+  "settings.services.tooltip.notificationsDisabled": "已停用通知",
+  "settings.services.headline": "您的服務",
+  "settings.services.noServicesAdded": "您還沒加入任何服務",
+  "settings.services.discoverServices": "服務列表",
+  "settings.services.updatedInfo": "更動已經儲存",
+  "settings.services.deletedInfo": "服務已刪除",
+  "settings.app.headline": "設定",
+  "settings.app.headlineGeneral": "一般",
+  "settings.app.headlineLanguage": "語言",
+  "settings.app.headlineUpdates": "更新",
+  "settings.app.buttonSearchForUpdate": "檢查更新",
+  "settings.app.buttonInstallUpdate": "重新開啟並且更新",
+  "settings.app.updateStatusSearching": "檢查更新中...",
+  "settings.app.updateStatusAvailable": "有可用更新，下載中...",
+  "settings.app.updateStatusUpToDate": "已經是最新版本了",
+  "settings.app.form.autoLaunchOnStart": "開機時啟動",
+  "settings.app.form.autoLaunchInBackground": "背景啟動",
+  "settings.app.form.enableSystemTray": "在系統匣上顯示",
+  "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
+  "settings.app.form.runInBackground": "關閉時保持在背景運作",
+  "settings.app.form.language": "語言",
+  "settings.app.form.beta": "包含開發中版本",
+  "settings.app.currentVersion": "當前版本：",
+  "settings.service.form.name": "Name",
+  "settings.service.form.enableService": "啟用服務",
+  "settings.service.form.enableNotification": "啟用通知",
+  "settings.service.form.team": "Team",
+  "settings.service.form.customUrl": "Custom server",
+  "settings.service.form.indirectMessages": "針對全部訊息顯示通知",
+  "settings.user.form.firstname": "名子",
+  "settings.user.form.lastname": "姓氏",
+  "settings.user.form.email": "電子郵件信箱",
+  "settings.user.form.currentPassword": "舊密碼",
+  "settings.user.form.newPassword": "新密碼",
+  "settings.user.form.accountType.label": "帳戶類型",
+  "settings.user.form.accountType.individual": "個人",
+  "settings.user.form.accountType.non-profit": "非營利",
+  "settings.user.form.accountType.company": "公司",
+  "subscription.type.free": "免費",
+  "subscription.type.month": "月",
+  "subscription.type.year": "年",
+  "subscription.type.mining": "用您機器的計算能力來贊助 Franz",
+  "subscription.mining.headline": "如何進行的？",
+  "subscription.mining.experimental": "實驗性功能",
+  "subscription.mining.line1": "Franz 運用您CPU的20%至50%的運算能力來挖門羅幣（一種開源加密貨幣），每年約莫可得到5美元。",
+  "subscription.mining.line2": "我們會調整運算強度，避免消耗過多電池電量及影響效能。",
+  "subscription.mining.line3": "當您允許我們挖掘門羅幣之時，我們便允許您使用全部的加值服務。",
+  "subscription.mining.moreInformation": "取得更多資訊",
+  "subscriptionPopup.buttonCancel": "取消",
+  "subscriptionPopup.buttonDone": "完成",
+  "tabs.item.reload": "重新載入",
+  "tabs.item.edit": "更改",
+  "tabs.item.disableNotifications": "停用通知",
+  "tabs.item.enableNotification": "啟用通知",
+  "tabs.item.disableService": "停用服務",
+  "tabs.item.deleteService": "刪除服務"
+}