From 4e559869defa23eef86e19aba639315ff0065d90 Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 7 Mar 2019 13:03:37 +0100 Subject: move translation scripts into src/i18n folder --- src/i18n/locales/en-US.json | 457 ++++++++++++++++++++++---------------------- 1 file changed, 227 insertions(+), 230 deletions(-) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 25ec027d8..bbf0997db 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -1,288 +1,285 @@ { + "app.errorHandler.action": "Reload", + "app.errorHandler.headline": "Something went wrong", + "feature.delayApp.action": "Get a Franz Supporter License", + "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting", + "feature.delayApp.text": "Franz will continue in {seconds} seconds.", + "feature.shareFranz.action.email": "Send as email", + "feature.shareFranz.action.facebook": "Share on Facebook", + "feature.shareFranz.action.twitter": "Share on Twitter", + "feature.shareFranz.headline": "Franz is better together!", + "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", + "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz", + "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", "global.api.unhealthy": "Can't connect to Franz online services", "global.notConnectedToTheInternet": "You are not connected to the internet.", - "global.spellchecking.language": "Spell checking language", + "global.premium.upgradeAccount": "!!!Please upgrade your account to add a new service.", "global.spellchecker.useDefault": "Use System Default ({default})", "global.spellchecking.autodetect": "Detect language automatically", "global.spellchecking.autodetect.short": "Automatic", - "welcome.signupButton": "Create a free account", - "welcome.loginButton": "Login to your account", - "welcome.slogan": "Messaging that works for you", - "login.headline": "Sign in", + "global.spellchecking.language": "Spell checking language", + "import.headline": "Import your Franz 4 services", + "import.notSupportedHeadline": "Services not yet supported in Franz 5", + "import.skip.label": "I want to add services manually", + "import.submit.label": "Import services", + "infobar.buttonChangelog": "What is new?", + "infobar.buttonInstallUpdate": "Restart & install update", + "infobar.buttonReloadServices": "Reload services", + "infobar.requiredRequestsFailed": "Could not load services and user information", + "infobar.servicesUpdated": "Your services have been updated.", + "infobar.updateAvailable": "A new update for Franz is available.", + "invite.email.label": "Email address", + "invite.headline.friends": "Invite 3 of your friends or colleagues", + "invite.name.label": "Name", + "invite.skip.label": "I want to do this later", + "invite.submit.label": "Send invites", + "invite.successInfo": "Invitations sent successfully", "login.email.label": "Email address", + "login.headline": "Sign in", + "login.invalidCredentials": "Email or password not valid", + "login.link.password": "Reset password", + "login.link.signup": "Create a free account", "login.password.label": "Password", + "login.serverLogout": "Your session expired, please login again.", "login.submit.label": "Sign in", - "login.invalidCredentials": "Email or password not valid", "login.tokenExpired": "Your session expired, please login again.", - "login.serverLogout": "Your session expired, please login again.", - "login.link.signup": "Create a free account", - "login.link.password": "Reset password", - "password.headline": "Reset password", + "menu.app.about": "About Franz", + "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.learnMore": "Learn More", + "menu.help.privacy": "Privacy Statement", + "menu.help.support": "Support", + "menu.help.tos": "Terms of Service", + "menu.services": "Services", + "menu.services.addNewService": "Add New Service...", + "menu.view": "View", + "menu.view.enterFullScreen": "Enter Full Screen", + "menu.view.exitFullScreen": "Exit Full Screen", + "menu.view.reloadFranz": "Reload Franz", + "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.zoomIn": "Zoom In", + "menu.view.zoomOut": "Zoom Out", + "menu.window": "Window", + "menu.window.close": "Close", + "menu.window.minimize": "Minimize", "password.email.label": "Email address", - "password.submit.label": "Submit", + "password.headline": "Reset password", + "password.link.login": "Sign in to your account", + "password.link.signup": "Create a free account", "password.noUser": "No user with that email address was found", + "password.submit.label": "Submit", "password.successInfo": "Please check your email", - "password.link.signup": "Create a free account", - "password.link.login": "Sign in to your account", - "signup.headline": "Sign up", - "signup.firstname.label": "First Name", - "signup.lastname.label": "Last Name", - "signup.email.label": "Email address", - "signup.company.label": "Company", - "signup.password.label": "Password", - "signup.submit.label": "Create account", - "signup.link.login": "Already have an account, sign in?", - "signup.emailDuplicate": "A user with that email address already exists", - "signup.legal.info": "By creating a Franz account you accept the", - "signup.legal.terms": "Terms of service", - "signup.legal.privacy": "Privacy Statement", + "premiumFeature.button.upgradeAccount": "Upgrade account", "pricing.headline": "Support Franz", - "pricing.support.label": "Select your support plan", - "pricing.submit.label": "I want to support the development of Franz", "pricing.link.skipPayment": "I don't want to support the development of Franz.", - "import.headline": "Import your Franz 4 services", - "import.notSupportedHeadline": "Services not yet supported in Franz 5", - "import.submit.label": "Import services", - "import.skip.label": "I want to add services manually", - "invite.submit.label": "Send invites", - "invite.headline.friends": "Invite 3 of your friends or colleagues", - "invite.name.label": "Name", - "invite.email.label": "Email address", - "invite.skip.label": "I want to do this later", - "invite.successInfo": "Invitations sent successfully", - "subscription.submit.label": "I want to support the development of Franz", - "subscription.paymentSessionError": "Could not initialize payment form", - "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes", - "subscription.features.onpremise": "Add on-premise/hosted services like HipChat", - "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost", - "subscription.features.encryptedSync": "Encrypted session synchronization", - "subscription.features.proxy": "Proxy support for services", - "subscription.features.ads": "No ads, ever!", - "subscription.features.spellchecker": "Support for spellchecker", - "subscription.features.noInterruptions": "No app delays & nagging to upgrade license", - "subscription.features.comingSoon": "coming soon", - "infobar.servicesUpdated": "Your services have been updated.", - "infobar.updateAvailable": "A new update for Franz is available.", - "infobar.buttonReloadServices": "Reload services", - "infobar.buttonInstallUpdate": "Restart & install update", - "infobar.buttonChangelog": "What is new?", - "infobar.requiredRequestsFailed": "Could not load services and user information", - "sidebar.settings": "Settings", - "sidebar.addNewService": "Add new service", - "sidebar.muteApp": "Disable notifications & audio", - "sidebar.unmuteApp": "Enable notifications & audio", - "services.welcome": "Welcome to Franz", + "pricing.submit.label": "I want to support the development of Franz", + "pricing.support.label": "Select your support plan", + "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.", "services.getStarted": "Get started", - "settings.searchService": "Search service", - "settings.account.headline": "Account", - "settings.account.headlineSubscription": "Your subscription", - "settings.account.headlineUpgrade": "Upgrade your account & support Franz", - "settings.account.headlineInvoices": "Invoices", - "settings.account.headlineDangerZone": "Danger Zone", - "settings.account.manageSubscription.label": "Manage your subscription", + "services.welcome": "Welcome to Franz", + "settings.account.account.editButton": "Edit account", "settings.account.accountType.basic": "Basic Account", + "settings.account.accountType.enterprise": "!!!Enterprise Account", "settings.account.accountType.premium": "Premium Supporter Account", - "settings.account.account.editButton": "Edit account", - "settings.account.invoiceDownload": "Download", - "settings.account.userInfoRequestFailed": "Could not load user information", - "settings.account.tryReloadUserInfoRequest": "Try again", - "settings.account.headlineProfile": "Update profile", - "settings.account.headlineAccount": "Account information", - "settings.account.headlinePassword": "Change password", - "settings.account.successInfo": "Your changes have been saved", "settings.account.buttonSave": "Update profile", "settings.account.deleteAccount": "Delete account", - "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.", "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 Franz account any longer, you can delete your account and all related data here.", + "settings.account.headline": "Account", + "settings.account.headlineAccount": "Account information", + "settings.account.headlineDangerZone": "Danger Zone", + "settings.account.headlineInvoices": "Invoices", + "settings.account.headlinePassword": "Change password", + "settings.account.headlineProfile": "Update profile", + "settings.account.headlineSubscription": "Your subscription", + "settings.account.headlineUpgrade": "Upgrade your account & support Franz", + "settings.account.invoiceDownload": "Download", + "settings.account.manageSubscription.label": "Manage your subscription", + "settings.account.successInfo": "Your changes have been saved", + "settings.account.tryReloadServices": "!!!Try again", + "settings.account.tryReloadUserInfoRequest": "Try again", + "settings.account.userInfoRequestFailed": "Could not load user information", + "settings.app.buttonClearAllCache": "Clear cache", + "settings.app.buttonInstallUpdate": "Restart & install update", + "settings.app.buttonSearchForUpdate": "Check for updates", + "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.", + "settings.app.currentVersion": "Current version:", + "settings.app.form.autoLaunchInBackground": "Open in background", + "settings.app.form.autoLaunchOnStart": "Launch Franz on start", + "settings.app.form.beta": "Include beta versions", + "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", + "settings.app.form.enableSpellchecking": "Enable spell checking", + "settings.app.form.enableSystemTray": "Show Franz in system tray", + "settings.app.form.language": "Language", + "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", + "settings.app.form.runInBackground": "Keep Franz in background when closing the window", + "settings.app.form.showDisabledServices": "Display disabled services tabs", + "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", + "settings.app.headline": "Settings", + "settings.app.headlineAdvanced": "Advanced", + "settings.app.headlineAppearance": "Appearance", + "settings.app.headlineGeneral": "General", + "settings.app.headlineLanguage": "Language", + "settings.app.headlineUpdates": "Updates", + "settings.app.restartRequired": "Changes require restart", + "settings.app.subheadlineCache": "Cache", + "settings.app.translationHelp": "Help us to translate Franz into your language.", + "settings.app.updateStatusAvailable": "Update available, downloading...", + "settings.app.updateStatusSearching": "Is searching for update", + "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", "settings.invite.headline": "Invite Friends", - "settings.navigation.availableServices": "Available services", - "settings.navigation.yourServices": "Your services", "settings.navigation.account": "Account", - "settings.navigation.settings": "Settings", + "settings.navigation.availableServices": "Available services", "settings.navigation.inviteFriends": "Invite Friends", "settings.navigation.logout": "Logout", - "settings.recipes.headline": "Available services", - "settings.recipes.mostPopular": "Most popular", + "settings.navigation.settings": "Settings", + "settings.navigation.yourServices": "Your services", "settings.recipes.all": "All services", "settings.recipes.dev": "Development", + "settings.recipes.headline": "Available services", + "settings.recipes.missingService": "Missing a service?", + "settings.recipes.mostPopular": "Most popular", "settings.recipes.nothingFound": "Sorry, but no service matched your search term.", "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added", - "settings.recipes.missingService": "Missing a service?", - "settings.service.form.saveButton": "Save service", - "settings.service.form.deleteButton": "Delete service", - "settings.service.form.availableServices": "Available services", - "settings.service.form.yourServices": "Your services", + "settings.searchService": "Search service", + "settings.service.error.goBack": "Back to services", + "settings.service.error.headline": "Error", + "settings.service.error.message": "Could not load service recipe.", "settings.service.form.addServiceHeadline": "Add {name}", - "settings.service.form.editServiceHeadline": "Edit {name}", - "settings.service.form.tabHosted": "Hosted", - "settings.service.form.tabOnPremise": "Self hosted ⭐️", - "settings.service.form.useHostedService": "Use the hosted {name} service.", - "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", + "settings.service.form.availableServices": "Available services", + "settings.service.form.customUrl": "Custom server", "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.", "settings.service.form.customUrlUpgradeAccount": "Upgrade your account", - "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...", - "settings.service.form.name": "Name", - "settings.service.form.enableService": "Enable service", - "settings.service.form.enableNotification": "Enable notifications", - "settings.service.form.enableBadge": "Show unread message badges", - "settings.service.form.team": "Team", - "settings.service.form.customUrl": "Custom server", - "settings.service.form.indirectMessages": "Show message badge for all new messages", + "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", + "settings.service.form.deleteButton": "Delete service", + "settings.service.form.editServiceHeadline": "Edit {name}", "settings.service.form.enableAudio": "Enable audio", - "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", - "settings.service.form.headlineNotifications": "Notifications", + "settings.service.form.enableBadge": "Show unread message badges", + "settings.service.form.enableDarkMode": "Enable Dark Mode", + "settings.service.form.enableNotification": "Enable notifications", + "settings.service.form.enableService": "Enable service", "settings.service.form.headlineBadges": "Unread message badges", "settings.service.form.headlineGeneral": "General", + "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.enableDarkMode": "Enable Dark Mode", + "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...", + "settings.service.form.indirectMessages": "Show message badge for all new messages", + "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", + "settings.service.form.name": "Name", "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings", - "settings.service.form.proxy.isEnabled": "Use Proxy", "settings.service.form.proxy.host": "Proxy Host/IP", - "settings.service.form.proxy.port": "Port", - "settings.service.form.proxy.user": "User (optional)", - "settings.service.form.proxy.password": "Password (optional)", "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz 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 Franz after changing proxy Settings.", - "settings.service.form.spellcheckerLanguage": "Spell checking Language", - "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})", - "settings.service.error.headline": "Error", - "settings.service.error.goBack": "Back to services", - "settings.service.error.message": "Could not load service recipe.", - "settings.services.tooltip.isDisabled": "Service is disabled", - "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", - "settings.services.tooltip.isMuted": "All sounds are muted", + "settings.service.form.proxy.user": "User (optional)", + "settings.service.form.saveButton": "Save service", + "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": "Your services", + "settings.services.deletedInfo": "Service has been deleted", + "settings.services.discoverServices": "Discover services", "settings.services.headline": "Your services", "settings.services.noServicesAdded": "You haven't added any services yet.", - "settings.services.discoverServices": "Discover services", + "settings.services.servicesRequestFailed": "!!!Could not load your services", + "settings.services.tooltip.isDisabled": "Service is disabled", + "settings.services.tooltip.isMuted": "All sounds are muted", + "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", "settings.services.updatedInfo": "Your changes have been saved", - "settings.services.deletedInfo": "Service has been deleted", - "settings.app.headline": "Settings", - "settings.app.headlineGeneral": "General", - "settings.app.headlineLanguage": "Language", - "settings.app.headlineUpdates": "Updates", - "settings.app.headlineAppearance": "Appearance", - "settings.app.headlineAdvanced": "Advanced", - "settings.app.buttonSearchForUpdate": "Check for updates", - "settings.app.buttonInstallUpdate": "Restart & install update", - "settings.app.updateStatusSearching": "Is searching for update", - "settings.app.updateStatusAvailable": "Update available, downloading...", - "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", - "settings.app.subheadlineCache": "Cache", - "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.", - "settings.app.buttonClearAllCache": "Clear cache", - "settings.app.form.autoLaunchOnStart": "Launch Franz on start", - "settings.app.form.autoLaunchInBackground": "Open in background", - "settings.app.form.enableSystemTray": "Show Franz in system tray", - "settings.app.form.darkMode": "Join the Dark Side", - "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", - "settings.app.form.enableMenuBar": "Show Franz in Menu Bar", - "settings.app.form.hideDockIcon": "Hide Franz icon in Dock", - "settings.app.form.runInBackground": "Keep Franz in background when closing the window", - "settings.app.form.language": "Language", - "settings.app.form.enableSpellchecking": "Enable spell checking", - "settings.app.form.spellcheckerLanguage": "Spell checking language", - "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.showDisabledServices": "Display disabled services tabs", - "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", - "settings.app.form.beta": "Include beta versions", - "settings.app.translationHelp": "Help us to translate Franz into your language.", - "settings.app.currentVersion": "Current version:", - "settings.app.restartRequired": "Changes require restart", + "settings.user.form.accountType.company": "Company", + "settings.user.form.accountType.individual": "Individual", + "settings.user.form.accountType.label": "Account type", + "settings.user.form.accountType.non-profit": "Non-Profit", + "settings.user.form.currentPassword": "Current password", + "settings.user.form.email": "Email", "settings.user.form.firstname": "First Name", "settings.user.form.lastname": "Last Name", - "settings.user.form.email": "Email", - "settings.user.form.currentPassword": "Current password", "settings.user.form.newPassword": "New password", - "settings.user.form.accountType.label": "Account type", - "settings.user.form.accountType.individual": "Individual", - "settings.user.form.accountType.non-profit": "Non-Profit", - "settings.user.form.accountType.company": "Company", + "sidebar.addNewService": "Add new service", + "sidebar.muteApp": "Disable notifications & audio", + "sidebar.settings": "Settings", + "sidebar.unmuteApp": "Enable notifications & audio", + "signup.company.label": "Company", + "signup.email.label": "Email address", + "signup.emailDuplicate": "A user with that email address already exists", + "signup.firstname.label": "First Name", + "signup.headline": "Sign up", + "signup.lastname.label": "Last Name", + "signup.legal.info": "By creating a Franz account you accept the", + "signup.legal.privacy": "Privacy Statement", + "signup.legal.terms": "Terms of service", + "signup.link.login": "Already have an account, sign in?", + "signup.password.label": "Password", + "signup.submit.label": "Create account", + "subscription.euTaxInfo": "EU residents: local sales tax may apply", + "subscription.features.ads": "No ads, ever!", + "subscription.features.comingSoon": "coming soon", + "subscription.features.noInterruptions": "No app delays & nagging to upgrade license", + "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost", + "subscription.features.proxy": "Proxy support for services", + "subscription.features.spellchecker": "Support for spellchecker", + "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes", + "subscription.paymentSessionError": "Could not initialize payment form", + "subscription.submit.label": "I want to support the development of Franz", "subscription.type.free": "free", "subscription.type.month": "month", "subscription.type.year": "year", - "subscription.euTaxInfo": "EU residents: local sales tax may apply", "subscriptionPopup.buttonCancel": "Cancel", "subscriptionPopup.buttonDone": "Done", - "tabs.item.reload": "Reload", - "tabs.item.edit": "Edit", - "tabs.item.disableNotifications": "Disable notifications", - "tabs.item.enableNotification": "Enable notifications", + "tabs.item.deleteService": "Delete service", "tabs.item.disableAudio": "Disable audio", - "tabs.item.enableAudio": "Enable audio", + "tabs.item.disableNotifications": "Disable notifications", "tabs.item.disableService": "Disable service", + "tabs.item.edit": "Edit", + "tabs.item.enableAudio": "Enable audio", + "tabs.item.enableNotification": "Enable notifications", "tabs.item.enableService": "Enable service", - "tabs.item.deleteService": "Delete service", - "service.crashHandler.headline": "Oh no!", - "service.crashHandler.text": "{name} has caused an error.", - "service.crashHandler.action": "Reload {name}", - "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds", - "service.errorHandler.headline": "Oh no!", - "service.errorHandler.text": "{name} has failed to load.", - "service.errorHandler.message": "Error", - "service.errorHandler.action": "Reload {name}", - "service.errorHandler.editAction": "Edit {name}", - "service.disabledHandler.headline": "{name} is disabled", - "service.disabledHandler.action": "Enable {name}", - "menu.edit": "Edit", - "menu.edit.undo": "Undo", - "menu.edit.redo": "Redo", - "menu.edit.cut": "Cut", - "menu.edit.copy": "Copy", - "menu.edit.paste": "Paste", - "menu.edit.pasteAndMatchStyle": "Paste And Match Style", - "menu.edit.delete": "Delete", - "menu.edit.selectAll": "Select All", - "menu.edit.speech": "Speech", - "menu.edit.startSpeaking": "Start Speaking", - "menu.edit.stopSpeaking": "Stop Speaking", - "menu.edit.startDictation": "Start Dictation", - "menu.edit.emojiSymbols": "Emoji & Symbols", - "menu.view.resetZoom": "Actual Size", - "menu.view.zoomIn": "Zoom In", - "menu.view.zoomOut": "Zoom Out", - "menu.view.enterFullScreen": "Enter Full Screen", - "menu.view.exitFullScreen": "Exit Full Screen", - "menu.view.toggleFullScreen": "Toggle Full Screen", - "menu.view.toggleDevTools": "Toggle Developer Tools", - "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools", - "menu.view.reloadService": "Reload Service", - "menu.view.reloadFranz": "Reload Franz", - "menu.window.minimize": "Minimize", - "menu.window.close": "Close", - "menu.help.learnMore": "Learn More", - "menu.help.changelog": "Changelog", - "menu.help.support": "Support", - "menu.help.tos": "Terms of Service", - "menu.help.privacy": "Privacy Statement", - "menu.file": "File", - "menu.view": "View", - "menu.services": "Services", - "menu.window": "Window", - "menu.help": "Help", - "menu.app.about": "About Franz", - "menu.app.settings": "Settings", - "menu.app.hide": "Hide", - "menu.app.hideOthers": "Hide Others", - "menu.app.unhide": "Unhide", - "menu.app.quit": "Quit", - "menu.services.addNewService": "Add New Service...", - "validation.required": "{field} is required", + "tabs.item.reload": "Reload", "validation.email": "{field} is not valid", - "validation.url": "{field} is not a valid URL", "validation.minLength": "{field} should be at least {length} characters long", - "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting", - "feature.delayApp.action": "Get a Franz Supporter License", - "feature.delayApp.text": "Franz will continue in {seconds} seconds.", - "premiumFeature.button.upgradeAccount": "Upgrade account", - "app.errorHandler.headline": "Something went wrong", - "app.errorHandler.action": "Reload", - "feature.shareFranz.headline": "Franz is better together!", - "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", - "feature.shareFranz.action.email": "Send as email", - "feature.shareFranz.action.facebook": "Share on Facebook", - "feature.shareFranz.action.twitter": "Share on Twitter", - "feature.shareFranz.shareText.email": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com", - "feature.shareFranz.shareText.twitter": "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz" -} + "validation.oneRequired": "!!!At least one is required", + "validation.required": "{field} is required", + "validation.url": "{field} is not a valid URL", + "welcome.loginButton": "Login to your account", + "welcome.signupButton": "Create a free account" +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From ae77c7c5dee548bd5032c80a0ad8aa294e7e4ff2 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 7 Mar 2019 16:13:53 +0100 Subject: Fix unused i18n strings --- .../settings/account/AccountDashboard.js | 4 -- src/i18n/globalMessages.js | 4 -- src/i18n/locales/defaultMessages.json | 78 ++++++++-------------- src/i18n/locales/en-US.json | 8 +-- src/i18n/messages/src/components/auth/Import.json | 2 +- src/i18n/messages/src/components/auth/Invite.json | 2 +- src/i18n/messages/src/components/auth/Login.json | 2 +- .../messages/src/components/auth/Password.json | 2 +- src/i18n/messages/src/components/auth/Pricing.json | 2 +- src/i18n/messages/src/components/auth/Signup.json | 2 +- src/i18n/messages/src/components/auth/Welcome.json | 2 +- .../messages/src/components/layout/AppLayout.json | 2 +- .../messages/src/components/layout/Sidebar.json | 2 +- .../content/ErrorHandlers/WebviewErrorHandler.json | 2 +- .../services/content/ServiceDisabled.json | 2 +- .../src/components/services/content/Services.json | 2 +- .../services/content/WebviewCrashHandler.json | 2 +- .../src/components/services/tabs/TabItem.json | 2 +- .../settings/account/AccountDashboard.json | 43 +++++------- .../settings/navigation/SettingsNavigation.json | 2 +- .../settings/recipes/RecipesDashboard.json | 2 +- .../settings/services/EditServiceForm.json | 2 +- .../components/settings/services/ServiceError.json | 2 +- .../components/settings/services/ServiceItem.json | 2 +- .../settings/services/ServicesDashboard.json | 2 +- .../settings/settings/EditSettingsForm.json | 2 +- .../src/components/settings/user/EditUserForm.json | 2 +- .../components/subscription/SubscriptionForm.json | 2 +- .../components/subscription/SubscriptionPopup.json | 2 +- .../ui/PremiumFeatureContainer/index.json | 2 +- .../src/components/util/ErrorBoundary/index.json | 2 +- .../src/containers/settings/EditServiceScreen.json | 2 +- .../containers/settings/EditSettingsScreen.json | 2 +- .../src/containers/settings/EditUserScreen.json | 2 +- .../messages/src/features/delayApp/Component.json | 2 +- .../src/features/shareFranz/Component.json | 2 +- .../messages/src/helpers/validation-helpers.json | 2 +- src/i18n/messages/src/i18n/globalMessages.json | 39 ++++------- src/i18n/messages/src/lib/Menu.json | 2 +- 39 files changed, 90 insertions(+), 152 deletions(-) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index f2d3ca8c0..181b95c8c 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -44,10 +44,6 @@ const messages = defineMessages({ id: 'settings.account.accountType.premium', defaultMessage: '!!!Premium Supporter Account', }, - accountTypeEnterprise: { - id: 'settings.account.accountType.enterprise', - defaultMessage: '!!!Enterprise Account', - }, accountEditButton: { id: 'settings.account.account.editButton', defaultMessage: '!!!Edit Account', diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js index 7b1618602..1b5ece223 100644 --- a/src/i18n/globalMessages.js +++ b/src/i18n/globalMessages.js @@ -1,10 +1,6 @@ import { defineMessages } from 'react-intl'; export default defineMessages({ - upgradeAccount: { - id: 'global.premium.upgradeAccount', - defaultMessage: '!!!Please upgrade your account to add a new service.', - }, APIUnhealthy: { id: 'global.api.unhealthy', defaultMessage: '!!!Can\'t connect to Franz Online Services', diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 11fd88f58..065398dc6 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -1176,108 +1176,95 @@ "line": 43 } }, - { - "defaultMessage": "!!!Enterprise Account", - "end": { - "column": 3, - "line": 50 - }, - "file": "src/components/settings/account/AccountDashboard.js", - "id": "settings.account.accountType.enterprise", - "start": { - "column": 25, - "line": 47 - } - }, { "defaultMessage": "!!!Edit Account", "end": { "column": 3, - "line": 54 + "line": 50 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.account.editButton", "start": { "column": 21, - "line": 51 + "line": 47 } }, { "defaultMessage": "!!!Download", "end": { "column": 3, - "line": 58 + "line": 54 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.invoiceDownload", "start": { "column": 19, - "line": 55 + "line": 51 } }, { "defaultMessage": "!!!Could not load user information", "end": { "column": 3, - "line": 62 + "line": 58 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.userInfoRequestFailed", "start": { "column": 25, - "line": 59 + "line": 55 } }, { "defaultMessage": "!!!Try again", "end": { "column": 3, - "line": 66 + "line": 62 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.tryReloadUserInfoRequest", "start": { "column": 28, - "line": 63 + "line": 59 } }, { "defaultMessage": "!!!Delete account", "end": { "column": 3, - "line": 70 + "line": 66 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.deleteAccount", "start": { "column": 17, - "line": 67 + "line": 63 } }, { "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.", "end": { "column": 3, - "line": 74 + "line": 70 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.deleteInfo", "start": { "column": 14, - "line": 71 + "line": 67 } }, { "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", "end": { "column": 3, - "line": 78 + "line": 74 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.deleteEmailSent", "start": { "column": 19, - "line": 75 + "line": 71 } } ], @@ -3247,95 +3234,82 @@ }, { "descriptors": [ - { - "defaultMessage": "!!!Please upgrade your account to add a new service.", - "end": { - "column": 3, - "line": 7 - }, - "file": "src/i18n/globalMessages.js", - "id": "global.premium.upgradeAccount", - "start": { - "column": 18, - "line": 4 - } - }, { "defaultMessage": "!!!Can't connect to Franz Online Services", "end": { "column": 3, - "line": 11 + "line": 7 }, "file": "src/i18n/globalMessages.js", "id": "global.api.unhealthy", "start": { "column": 16, - "line": 8 + "line": 4 } }, { "defaultMessage": "!!!You are not connected to the internet.", "end": { "column": 3, - "line": 15 + "line": 11 }, "file": "src/i18n/globalMessages.js", "id": "global.notConnectedToTheInternet", "start": { "column": 29, - "line": 12 + "line": 8 } }, { "defaultMessage": "!!!Spell checking language", "end": { "column": 3, - "line": 19 + "line": 15 }, "file": "src/i18n/globalMessages.js", "id": "global.spellchecking.language", "start": { "column": 24, - "line": 16 + "line": 12 } }, { "defaultMessage": "!!!Use System Default ({default})", "end": { "column": 3, - "line": 23 + "line": 19 }, "file": "src/i18n/globalMessages.js", "id": "global.spellchecker.useDefault", "start": { "column": 29, - "line": 20 + "line": 16 } }, { "defaultMessage": "!!!Detect language automatically", "end": { "column": 3, - "line": 27 + "line": 23 }, "file": "src/i18n/globalMessages.js", "id": "global.spellchecking.autodetect", "start": { "column": 34, - "line": 24 + "line": 20 } }, { "defaultMessage": "!!!Automatic", "end": { "column": 3, - "line": 31 + "line": 27 }, "file": "src/i18n/globalMessages.js", "id": "global.spellchecking.autodetect.short", "start": { "column": 39, - "line": 28 + "line": 24 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index bbf0997db..af6edd2df 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -13,7 +13,6 @@ "feature.shareFranz.text": "Tell your friends and colleagues how awesome Franz is and help us to spread the word.", "global.api.unhealthy": "Can't connect to Franz online services", "global.notConnectedToTheInternet": "You are not connected to the internet.", - "global.premium.upgradeAccount": "!!!Please upgrade your account to add a new service.", "global.spellchecker.useDefault": "Use System Default ({default})", "global.spellchecking.autodetect": "Detect language automatically", "global.spellchecking.autodetect.short": "Automatic", @@ -113,7 +112,6 @@ "services.welcome": "Welcome to Franz", "settings.account.account.editButton": "Edit account", "settings.account.accountType.basic": "Basic Account", - "settings.account.accountType.enterprise": "!!!Enterprise Account", "settings.account.accountType.premium": "Premium Supporter Account", "settings.account.buttonSave": "Update profile", "settings.account.deleteAccount": "Delete account", @@ -130,7 +128,7 @@ "settings.account.invoiceDownload": "Download", "settings.account.manageSubscription.label": "Manage your subscription", "settings.account.successInfo": "Your changes have been saved", - "settings.account.tryReloadServices": "!!!Try again", + "settings.account.tryReloadServices": "Try again", "settings.account.tryReloadUserInfoRequest": "Try again", "settings.account.userInfoRequestFailed": "Could not load user information", "settings.app.buttonClearAllCache": "Clear cache", @@ -221,7 +219,7 @@ "settings.services.discoverServices": "Discover services", "settings.services.headline": "Your services", "settings.services.noServicesAdded": "You haven't added any services yet.", - "settings.services.servicesRequestFailed": "!!!Could not load your services", + "settings.services.servicesRequestFailed": "Could not load your services", "settings.services.tooltip.isDisabled": "Service is disabled", "settings.services.tooltip.isMuted": "All sounds are muted", "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", @@ -277,7 +275,7 @@ "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.oneRequired": "At least one is required", "validation.required": "{field} is required", "validation.url": "{field} is not a valid URL", "welcome.loginButton": "Login to your account", diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json index 73684b6c0..264fc729b 100644 --- a/src/i18n/messages/src/components/auth/Import.json +++ b/src/i18n/messages/src/components/auth/Import.json @@ -51,4 +51,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json index 12d2b6be0..57c9bddcf 100644 --- a/src/i18n/messages/src/components/auth/Invite.json +++ b/src/i18n/messages/src/components/auth/Invite.json @@ -90,4 +90,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json index 1a86cb872..177f6000b 100644 --- a/src/i18n/messages/src/components/auth/Login.json +++ b/src/i18n/messages/src/components/auth/Login.json @@ -116,4 +116,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json index 40be13c15..f335b3acb 100644 --- a/src/i18n/messages/src/components/auth/Password.json +++ b/src/i18n/messages/src/components/auth/Password.json @@ -90,4 +90,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json index 58c4a75b9..f711a55b4 100644 --- a/src/i18n/messages/src/components/auth/Pricing.json +++ b/src/i18n/messages/src/components/auth/Pricing.json @@ -51,4 +51,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json index 8b877db98..a09745048 100644 --- a/src/i18n/messages/src/components/auth/Signup.json +++ b/src/i18n/messages/src/components/auth/Signup.json @@ -155,4 +155,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json index 14d8ca939..b4d2ce689 100644 --- a/src/i18n/messages/src/components/auth/Welcome.json +++ b/src/i18n/messages/src/components/auth/Welcome.json @@ -25,4 +25,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json index cec5eeaf1..07603d062 100644 --- a/src/i18n/messages/src/components/layout/AppLayout.json +++ b/src/i18n/messages/src/components/layout/AppLayout.json @@ -77,4 +77,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json index d18d6ca21..7aa00a186 100644 --- a/src/i18n/messages/src/components/layout/Sidebar.json +++ b/src/i18n/messages/src/components/layout/Sidebar.json @@ -51,4 +51,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json index 428d7f472..c8fe802df 100644 --- a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json +++ b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json @@ -64,4 +64,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json index 9e3cf3df0..8bfad28c7 100644 --- a/src/i18n/messages/src/components/services/content/ServiceDisabled.json +++ b/src/i18n/messages/src/components/services/content/ServiceDisabled.json @@ -25,4 +25,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json index 642a0949e..884ab0c90 100644 --- a/src/i18n/messages/src/components/services/content/Services.json +++ b/src/i18n/messages/src/components/services/content/Services.json @@ -25,4 +25,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json index 06307bb31..c3d6c41a5 100644 --- a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json +++ b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json @@ -51,4 +51,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json index 7faf07843..08a07845c 100644 --- a/src/i18n/messages/src/components/services/tabs/TabItem.json +++ b/src/i18n/messages/src/components/services/tabs/TabItem.json @@ -116,4 +116,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json index fbb0e8de4..603950395 100644 --- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json +++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json @@ -103,29 +103,16 @@ "column": 3 } }, - { - "id": "settings.account.accountType.enterprise", - "defaultMessage": "!!!Enterprise Account", - "file": "src/components/settings/account/AccountDashboard.js", - "start": { - "line": 47, - "column": 25 - }, - "end": { - "line": 50, - "column": 3 - } - }, { "id": "settings.account.account.editButton", "defaultMessage": "!!!Edit Account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 51, + "line": 47, "column": 21 }, "end": { - "line": 54, + "line": 50, "column": 3 } }, @@ -134,11 +121,11 @@ "defaultMessage": "!!!Download", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 55, + "line": 51, "column": 19 }, "end": { - "line": 58, + "line": 54, "column": 3 } }, @@ -147,11 +134,11 @@ "defaultMessage": "!!!Could not load user information", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 59, + "line": 55, "column": 25 }, "end": { - "line": 62, + "line": 58, "column": 3 } }, @@ -160,11 +147,11 @@ "defaultMessage": "!!!Try again", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 63, + "line": 59, "column": 28 }, "end": { - "line": 66, + "line": 62, "column": 3 } }, @@ -173,11 +160,11 @@ "defaultMessage": "!!!Delete account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 67, + "line": 63, "column": 17 }, "end": { - "line": 70, + "line": 66, "column": 3 } }, @@ -186,11 +173,11 @@ "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 71, + "line": 67, "column": 14 }, "end": { - "line": 74, + "line": 70, "column": 3 } }, @@ -199,12 +186,12 @@ "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 75, + "line": 71, "column": 19 }, "end": { - "line": 78, + "line": 74, "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json index 6cb6adc11..785ce9f29 100644 --- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json +++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json @@ -77,4 +77,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json index 74d9032b3..7d9ed3283 100644 --- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json +++ b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json @@ -103,4 +103,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json index 02290594a..42b741b7a 100644 --- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json +++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json @@ -285,4 +285,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json index fa60ac931..648fc5b3e 100644 --- a/src/i18n/messages/src/components/settings/services/ServiceError.json +++ b/src/i18n/messages/src/components/settings/services/ServiceError.json @@ -51,4 +51,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json index 70969641c..ffea8b9e1 100644 --- a/src/i18n/messages/src/components/settings/services/ServiceItem.json +++ b/src/i18n/messages/src/components/settings/services/ServiceItem.json @@ -38,4 +38,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json index 76fd714af..3803c6512 100644 --- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json +++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json @@ -116,4 +116,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 15beba9ab..c64f477be 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -220,4 +220,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json index 0524f0b2c..3a59f8681 100644 --- a/src/i18n/messages/src/components/settings/user/EditUserForm.json +++ b/src/i18n/messages/src/components/settings/user/EditUserForm.json @@ -77,4 +77,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json index 38d4eb25e..cc7470358 100644 --- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json +++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json @@ -168,4 +168,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json index fc2e8f8cd..c06da7531 100644 --- a/src/i18n/messages/src/components/subscription/SubscriptionPopup.json +++ b/src/i18n/messages/src/components/subscription/SubscriptionPopup.json @@ -25,4 +25,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json index 608cfc966..582d546fa 100644 --- a/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json +++ b/src/i18n/messages/src/components/ui/PremiumFeatureContainer/index.json @@ -12,4 +12,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json index fd8a8443a..43c323031 100644 --- a/src/i18n/messages/src/components/util/ErrorBoundary/index.json +++ b/src/i18n/messages/src/components/util/ErrorBoundary/index.json @@ -25,4 +25,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json index e24b2484d..42ca42125 100644 --- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json +++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json @@ -194,4 +194,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 7f79c347e..d3b413540 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -155,4 +155,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json index 200dd5eab..70ff29945 100644 --- a/src/i18n/messages/src/containers/settings/EditUserScreen.json +++ b/src/i18n/messages/src/containers/settings/EditUserScreen.json @@ -116,4 +116,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/features/delayApp/Component.json b/src/i18n/messages/src/features/delayApp/Component.json index aa82b040e..bacd9444a 100644 --- a/src/i18n/messages/src/features/delayApp/Component.json +++ b/src/i18n/messages/src/features/delayApp/Component.json @@ -38,4 +38,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/features/shareFranz/Component.json b/src/i18n/messages/src/features/shareFranz/Component.json index 8b672ee54..0fec9db64 100644 --- a/src/i18n/messages/src/features/shareFranz/Component.json +++ b/src/i18n/messages/src/features/shareFranz/Component.json @@ -90,4 +90,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json index cec9acca3..86bfe1500 100644 --- a/src/i18n/messages/src/helpers/validation-helpers.json +++ b/src/i18n/messages/src/helpers/validation-helpers.json @@ -64,4 +64,4 @@ "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json index 3cb4675dc..28001614f 100644 --- a/src/i18n/messages/src/i18n/globalMessages.json +++ b/src/i18n/messages/src/i18n/globalMessages.json @@ -1,27 +1,14 @@ [ - { - "id": "global.premium.upgradeAccount", - "defaultMessage": "!!!Please upgrade your account to add a new service.", - "file": "src/i18n/globalMessages.js", - "start": { - "line": 4, - "column": 18 - }, - "end": { - "line": 7, - "column": 3 - } - }, { "id": "global.api.unhealthy", "defaultMessage": "!!!Can't connect to Franz Online Services", "file": "src/i18n/globalMessages.js", "start": { - "line": 8, + "line": 4, "column": 16 }, "end": { - "line": 11, + "line": 7, "column": 3 } }, @@ -30,11 +17,11 @@ "defaultMessage": "!!!You are not connected to the internet.", "file": "src/i18n/globalMessages.js", "start": { - "line": 12, + "line": 8, "column": 29 }, "end": { - "line": 15, + "line": 11, "column": 3 } }, @@ -43,11 +30,11 @@ "defaultMessage": "!!!Spell checking language", "file": "src/i18n/globalMessages.js", "start": { - "line": 16, + "line": 12, "column": 24 }, "end": { - "line": 19, + "line": 15, "column": 3 } }, @@ -56,11 +43,11 @@ "defaultMessage": "!!!Use System Default ({default})", "file": "src/i18n/globalMessages.js", "start": { - "line": 20, + "line": 16, "column": 29 }, "end": { - "line": 23, + "line": 19, "column": 3 } }, @@ -69,11 +56,11 @@ "defaultMessage": "!!!Detect language automatically", "file": "src/i18n/globalMessages.js", "start": { - "line": 24, + "line": 20, "column": 34 }, "end": { - "line": 27, + "line": 23, "column": 3 } }, @@ -82,12 +69,12 @@ "defaultMessage": "!!!Automatic", "file": "src/i18n/globalMessages.js", "start": { - "line": 28, + "line": 24, "column": 39 }, "end": { - "line": 31, + "line": 27, "column": 3 } } -] +] \ No newline at end of file diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json index 34b7bdcb8..6958f0219 100644 --- a/src/i18n/messages/src/lib/Menu.json +++ b/src/i18n/messages/src/lib/Menu.json @@ -558,4 +558,4 @@ "column": 3 } } -] +] \ No newline at end of file -- cgit v1.2.3-54-g00ecf From a73e6bd9814d49eeb1cc7ff350cb5e4a621fd4ad Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 7 Mar 2019 16:47:32 +0100 Subject: fix(Service) shortcuts for activating prev/next service fixes #1298 --- src/i18n/locales/defaultMessages.json | 26 ++++++++++++++++++ src/i18n/locales/en-US.json | 4 ++- src/i18n/messages/src/lib/Menu.json | 26 ++++++++++++++++++ src/lib/Menu.js | 52 +++++++++++++++++++++++++---------- src/stores/AppStore.js | 13 --------- 5 files changed, 92 insertions(+), 29 deletions(-) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 065398dc6..d3a97de78 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3875,6 +3875,32 @@ "column": 17, "line": 178 } + }, + { + "defaultMessage": "!!!Activate next service...", + "end": { + "column": 3, + "line": 185 + }, + "file": "src/lib/Menu.js", + "id": "menu.services.setNextServiceActive", + "start": { + "column": 23, + "line": 182 + } + }, + { + "defaultMessage": "!!!Activate previous service...", + "end": { + "column": 3, + "line": 189 + }, + "file": "src/lib/Menu.js", + "id": "menu.services.activatePreviousService", + "start": { + "column": 27, + "line": 186 + } } ], "path": "src/lib/Menu.json" diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index af6edd2df..a9ac92a3a 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -70,7 +70,9 @@ "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.setNextServiceActive": "Activate next service", "menu.view": "View", "menu.view.enterFullScreen": "Enter Full Screen", "menu.view.exitFullScreen": "Exit Full Screen", @@ -280,4 +282,4 @@ "validation.url": "{field} is not a valid URL", "welcome.loginButton": "Login to your account", "welcome.signupButton": "Create a free account" -} \ No newline at end of file +} diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json index 6958f0219..a131851aa 100644 --- a/src/i18n/messages/src/lib/Menu.json +++ b/src/i18n/messages/src/lib/Menu.json @@ -557,5 +557,31 @@ "line": 181, "column": 3 } + }, + { + "id": "menu.services.setNextServiceActive", + "defaultMessage": "!!!Activate next service...", + "file": "src/lib/Menu.js", + "start": { + "line": 182, + "column": 23 + }, + "end": { + "line": 185, + "column": 3 + } + }, + { + "id": "menu.services.activatePreviousService", + "defaultMessage": "!!!Activate previous service...", + "file": "src/lib/Menu.js", + "start": { + "line": 186, + "column": 27 + }, + "end": { + "line": 189, + "column": 3 + } } ] \ No newline at end of file diff --git a/src/lib/Menu.js b/src/lib/Menu.js index dce8ab969..7bdbd9159 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -179,6 +179,14 @@ const menuItems = defineMessages({ id: 'menu.services.addNewService', defaultMessage: '!!!Add New Service...', }, + activateNextService: { + id: 'menu.services.setNextServiceActive', + defaultMessage: '!!!Activate next service...', + }, + activatePreviousService: { + id: 'menu.services.activatePreviousService', + defaultMessage: '!!!Activate previous service...', + }, }); function getActiveWebview() { @@ -525,7 +533,7 @@ export default class FranzMenu { return; } - const intl = window.franz.intl; + const { intl } = window.franz; const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl); tpl[1].submenu.push({ @@ -683,17 +691,6 @@ export default class FranzMenu { }, about); } - serviceTpl.unshift({ - label: intl.formatMessage(menuItems.addNewService), - accelerator: `${cmdKey}+N`, - click: () => { - this.actions.ui.openSettings({ path: 'recipes' }); - }, - enabled: this.stores.user.isLoggedIn, - }, { - type: 'separator', - }); - if (serviceTpl.length > 0) { tpl[3].submenu = serviceTpl; } @@ -704,10 +701,35 @@ export default class FranzMenu { } @computed get serviceTpl() { + const { intl } = window.franz; const services = this.stores.services.allDisplayed; + const menu = [{ + label: intl.formatMessage(menuItems.addNewService), + accelerator: `${cmdKey}+N`, + click: () => { + this.actions.ui.openSettings({ path: 'recipes' }); + }, + enabled: this.stores.user.isLoggedIn, + }, { + type: 'separator', + }, { + label: intl.formatMessage(menuItems.activateNextService), + accelerator: `${cmdKey}+alt+right`, + click: () => this.actions.service.setActiveNext(), + enabled: this.stores.user.isLoggedIn, + }, { + label: intl.formatMessage(menuItems.activatePreviousService), + accelerator: `${cmdKey}+alt+left`, + click: () => this.actions.service.setActivePrev(), + enabled: this.stores.user.isLoggedIn, + }, { + type: 'separator', + }]; + + menu.push(); if (this.stores.user.isLoggedIn) { - return services.map((service, i) => ({ + services.forEach((service, i) => (menu.push({ label: this._getServiceName(service), accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null, type: 'radio', @@ -715,10 +737,10 @@ export default class FranzMenu { click: () => { this.actions.service.setActive({ serviceId: service.id }); }, - })); + }))); } - return []; + return menu; } _getServiceName(service) { diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index d933ca407..1db61a64e 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -157,19 +157,6 @@ export default class AppStore extends Store { this.stores.router.push(url); }); - // Set active the next service - key( - '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => { - this.actions.service.setActiveNext(); - }, - ); - - // Set active the prev service - key( - '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => { - this.actions.service.setActivePrev(); - }, - ); // Global Mute key( -- cgit v1.2.3-54-g00ecf From 1044b503fb64d7a8fb98862470f05377ac2f8d2e Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 7 Mar 2019 17:27:42 +0100 Subject: add missing react-intl files --- src/i18n/locales/defaultMessages.json | 26 ++++++++++++++++++++++++++ src/i18n/locales/en-US.json | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index d3a97de78..0641c510c 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3901,6 +3901,32 @@ "column": 27, "line": 186 } + }, + { + "defaultMessage": "!!!Disable notifications & audio", + "end": { + "column": 3, + "line": 193 + }, + "file": "src/lib/Menu.js", + "id": "sidebar.muteApp", + "start": { + "column": 11, + "line": 190 + } + }, + { + "defaultMessage": "!!!Enable notifications & audio", + "end": { + "column": 3, + "line": 197 + }, + "file": "src/lib/Menu.js", + "id": "sidebar.unmuteApp", + "start": { + "column": 13, + "line": 194 + } } ], "path": "src/lib/Menu.json" diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index a9ac92a3a..7543d38bd 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -282,4 +282,4 @@ "validation.url": "{field} is not a valid URL", "welcome.loginButton": "Login to your account", "welcome.signupButton": "Create a free account" -} +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf