diff options
author | 2018-01-08 10:34:00 +0100 | |
---|---|---|
committer | 2018-01-08 10:34:00 +0100 | |
commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/i18n | |
parent | Sort languages by name (diff) | |
parent | Add color to service icons (diff) | |
download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/i18n')
-rw-r--r-- | src/i18n/locales/en-US.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 48b408e59..7fc9eac1c 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -66,6 +66,7 @@ | |||
66 | "sidebar.unmuteApp": "Enable notifications & audio", | 66 | "sidebar.unmuteApp": "Enable notifications & audio", |
67 | "services.welcome": "Welcome to Franz", | 67 | "services.welcome": "Welcome to Franz", |
68 | "services.getStarted": "Get started", | 68 | "services.getStarted": "Get started", |
69 | "settings.searchService": "Search service", | ||
69 | "settings.account.headline": "Account", | 70 | "settings.account.headline": "Account", |
70 | "settings.account.headlineSubscription": "Your subscription", | 71 | "settings.account.headlineSubscription": "Your subscription", |
71 | "settings.account.headlineUpgrade": "Upgrade your account & support Franz", | 72 | "settings.account.headlineUpgrade": "Upgrade your account & support Franz", |
@@ -110,6 +111,7 @@ | |||
110 | "settings.service.form.editServiceHeadline": "Edit {name}", | 111 | "settings.service.form.editServiceHeadline": "Edit {name}", |
111 | "settings.service.form.tabHosted": "Hosted", | 112 | "settings.service.form.tabHosted": "Hosted", |
112 | "settings.service.form.tabOnPremise": "Self hosted ⭐️", | 113 | "settings.service.form.tabOnPremise": "Self hosted ⭐️", |
114 | "settings.service.form.useHostedService": "Use the hosted {name} service.", | ||
113 | "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", | 115 | "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.", |
114 | "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.", | 116 | "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Franz Premium Supporter Account.", |
115 | "settings.service.form.customUrlUpgradeAccount": "Upgrade your account", | 117 | "settings.service.form.customUrlUpgradeAccount": "Upgrade your account", |
@@ -117,11 +119,18 @@ | |||
117 | "settings.service.form.name": "Name", | 119 | "settings.service.form.name": "Name", |
118 | "settings.service.form.enableService": "Enable service", | 120 | "settings.service.form.enableService": "Enable service", |
119 | "settings.service.form.enableNotification": "Enable notifications", | 121 | "settings.service.form.enableNotification": "Enable notifications", |
122 | "settings.service.form.enableBadge": "Show unread message badges", | ||
120 | "settings.service.form.team": "Team", | 123 | "settings.service.form.team": "Team", |
121 | "settings.service.form.customUrl": "Custom server", | 124 | "settings.service.form.customUrl": "Custom server", |
122 | "settings.service.form.indirectMessages": "Show message badge for all new messages", | 125 | "settings.service.form.indirectMessages": "Show message badge for all new messages", |
123 | "settings.service.form.enableAudio": "Enable audio", | 126 | "settings.service.form.enableAudio": "Enable audio", |
124 | "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", | 127 | "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted", |
128 | "settings.service.form.headlineNotifications": "Notifications", | ||
129 | "settings.service.form.headlineBadges": "Unread message badges", | ||
130 | "settings.service.form.headlineGeneral": "General", | ||
131 | "settings.service.form.icon": "Custom icon", | ||
132 | "settings.service.form.iconDelete": "Delete", | ||
133 | "settings.service.form.iconUpload": "Drop your image, or click here", | ||
125 | "settings.service.error.headline": "Error", | 134 | "settings.service.error.headline": "Error", |
126 | "settings.service.error.goBack": "Back to services", | 135 | "settings.service.error.goBack": "Back to services", |
127 | "settings.service.error.message": "Could not load service recipe.", | 136 | "settings.service.error.message": "Could not load service recipe.", |
@@ -144,6 +153,9 @@ | |||
144 | "settings.app.updateStatusSearching": "Is searching for update", | 153 | "settings.app.updateStatusSearching": "Is searching for update", |
145 | "settings.app.updateStatusAvailable": "Update available, downloading...", | 154 | "settings.app.updateStatusAvailable": "Update available, downloading...", |
146 | "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", | 155 | "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", |
156 | "settings.app.subheadlineCache": "Cache", | ||
157 | "settings.app.cacheInfo": "Franz cache is currently using {size} of disk space.", | ||
158 | "settings.app.buttonClearAllCache": "Clear cache", | ||
147 | "settings.app.form.autoLaunchOnStart": "Launch Franz on start", | 159 | "settings.app.form.autoLaunchOnStart": "Launch Franz on start", |
148 | "settings.app.form.autoLaunchInBackground": "Open in background", | 160 | "settings.app.form.autoLaunchInBackground": "Open in background", |
149 | "settings.app.form.enableSystemTray": "Show Franz in system tray", | 161 | "settings.app.form.enableSystemTray": "Show Franz in system tray", |