diff options
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 117 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/index.js | 5 |
4 files changed, 69 insertions, 56 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index c961d7541..10ca376f8 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -40,7 +40,7 @@ const messages = defineMessages({ | |||
40 | }, | 40 | }, |
41 | startMinimized: { | 41 | startMinimized: { |
42 | id: 'settings.app.form.startMinimized', | 42 | id: 'settings.app.form.startMinimized', |
43 | defaultMessage: '!!!Start minimized' | 43 | defaultMessage: '!!!Start minimized', |
44 | }, | 44 | }, |
45 | enableSystemTray: { | 45 | enableSystemTray: { |
46 | id: 'settings.app.form.enableSystemTray', | 46 | id: 'settings.app.form.enableSystemTray', |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 10092cd9e..a3f53b6dc 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -4071,341 +4071,354 @@ | |||
4071 | } | 4071 | } |
4072 | }, | 4072 | }, |
4073 | { | 4073 | { |
4074 | "defaultMessage": "!!!Show Ferdi in system tray", | 4074 | "defaultMessage": "!!!Start minimized", |
4075 | "end": { | 4075 | "end": { |
4076 | "column": 3, | 4076 | "column": 3, |
4077 | "line": 44 | 4077 | "line": 44 |
4078 | }, | 4078 | }, |
4079 | "file": "src/containers/settings/EditSettingsScreen.js", | 4079 | "file": "src/containers/settings/EditSettingsScreen.js", |
4080 | "id": "settings.app.form.startMinimized", | ||
4081 | "start": { | ||
4082 | "column": 18, | ||
4083 | "line": 41 | ||
4084 | } | ||
4085 | }, | ||
4086 | { | ||
4087 | "defaultMessage": "!!!Show Ferdi in system tray", | ||
4088 | "end": { | ||
4089 | "column": 3, | ||
4090 | "line": 48 | ||
4091 | }, | ||
4092 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
4080 | "id": "settings.app.form.enableSystemTray", | 4093 | "id": "settings.app.form.enableSystemTray", |
4081 | "start": { | 4094 | "start": { |
4082 | "column": 20, | 4095 | "column": 20, |
4083 | "line": 41 | 4096 | "line": 45 |
4084 | } | 4097 | } |
4085 | }, | 4098 | }, |
4086 | { | 4099 | { |
4087 | "defaultMessage": "!!!Minimize Ferdi to system tray", | 4100 | "defaultMessage": "!!!Minimize Ferdi to system tray", |
4088 | "end": { | 4101 | "end": { |
4089 | "column": 3, | 4102 | "column": 3, |
4090 | "line": 48 | 4103 | "line": 52 |
4091 | }, | 4104 | }, |
4092 | "file": "src/containers/settings/EditSettingsScreen.js", | 4105 | "file": "src/containers/settings/EditSettingsScreen.js", |
4093 | "id": "settings.app.form.minimizeToSystemTray", | 4106 | "id": "settings.app.form.minimizeToSystemTray", |
4094 | "start": { | 4107 | "start": { |
4095 | "column": 24, | 4108 | "column": 24, |
4096 | "line": 45 | 4109 | "line": 49 |
4097 | } | 4110 | } |
4098 | }, | 4111 | }, |
4099 | { | 4112 | { |
4100 | "defaultMessage": "!!!Don't show message content in notifications", | 4113 | "defaultMessage": "!!!Don't show message content in notifications", |
4101 | "end": { | 4114 | "end": { |
4102 | "column": 3, | 4115 | "column": 3, |
4103 | "line": 52 | 4116 | "line": 56 |
4104 | }, | 4117 | }, |
4105 | "file": "src/containers/settings/EditSettingsScreen.js", | 4118 | "file": "src/containers/settings/EditSettingsScreen.js", |
4106 | "id": "settings.app.form.privateNotifications", | 4119 | "id": "settings.app.form.privateNotifications", |
4107 | "start": { | 4120 | "start": { |
4108 | "column": 24, | 4121 | "column": 24, |
4109 | "line": 49 | 4122 | "line": 53 |
4110 | } | 4123 | } |
4111 | }, | 4124 | }, |
4112 | { | 4125 | { |
4113 | "defaultMessage": "!!!Always show service navigation bar", | 4126 | "defaultMessage": "!!!Always show service navigation bar", |
4114 | "end": { | 4127 | "end": { |
4115 | "column": 3, | 4128 | "column": 3, |
4116 | "line": 56 | 4129 | "line": 60 |
4117 | }, | 4130 | }, |
4118 | "file": "src/containers/settings/EditSettingsScreen.js", | 4131 | "file": "src/containers/settings/EditSettingsScreen.js", |
4119 | "id": "settings.app.form.showServiceNavigationBar", | 4132 | "id": "settings.app.form.showServiceNavigationBar", |
4120 | "start": { | 4133 | "start": { |
4121 | "column": 28, | 4134 | "column": 28, |
4122 | "line": 53 | 4135 | "line": 57 |
4123 | } | 4136 | } |
4124 | }, | 4137 | }, |
4125 | { | 4138 | { |
4126 | "defaultMessage": "!!!Enable service hibernation", | 4139 | "defaultMessage": "!!!Enable service hibernation", |
4127 | "end": { | 4140 | "end": { |
4128 | "column": 3, | 4141 | "column": 3, |
4129 | "line": 60 | 4142 | "line": 64 |
4130 | }, | 4143 | }, |
4131 | "file": "src/containers/settings/EditSettingsScreen.js", | 4144 | "file": "src/containers/settings/EditSettingsScreen.js", |
4132 | "id": "settings.app.form.hibernate", | 4145 | "id": "settings.app.form.hibernate", |
4133 | "start": { | 4146 | "start": { |
4134 | "column": 13, | 4147 | "column": 13, |
4135 | "line": 57 | 4148 | "line": 61 |
4136 | } | 4149 | } |
4137 | }, | 4150 | }, |
4138 | { | 4151 | { |
4139 | "defaultMessage": "!!!Hibernation strategy", | 4152 | "defaultMessage": "!!!Hibernation strategy", |
4140 | "end": { | 4153 | "end": { |
4141 | "column": 3, | 4154 | "column": 3, |
4142 | "line": 64 | 4155 | "line": 68 |
4143 | }, | 4156 | }, |
4144 | "file": "src/containers/settings/EditSettingsScreen.js", | 4157 | "file": "src/containers/settings/EditSettingsScreen.js", |
4145 | "id": "settings.app.form.hibernationStrategy", | 4158 | "id": "settings.app.form.hibernationStrategy", |
4146 | "start": { | 4159 | "start": { |
4147 | "column": 23, | 4160 | "column": 23, |
4148 | "line": 61 | 4161 | "line": 65 |
4149 | } | 4162 | } |
4150 | }, | 4163 | }, |
4151 | { | 4164 | { |
4152 | "defaultMessage": "!!!Server", | 4165 | "defaultMessage": "!!!Server", |
4153 | "end": { | 4166 | "end": { |
4154 | "column": 3, | 4167 | "column": 3, |
4155 | "line": 68 | 4168 | "line": 72 |
4156 | }, | 4169 | }, |
4157 | "file": "src/containers/settings/EditSettingsScreen.js", | 4170 | "file": "src/containers/settings/EditSettingsScreen.js", |
4158 | "id": "settings.app.form.server", | 4171 | "id": "settings.app.form.server", |
4159 | "start": { | 4172 | "start": { |
4160 | "column": 10, | 4173 | "column": 10, |
4161 | "line": 65 | 4174 | "line": 69 |
4162 | } | 4175 | } |
4163 | }, | 4176 | }, |
4164 | { | 4177 | { |
4165 | "defaultMessage": "!!!Todo Server", | 4178 | "defaultMessage": "!!!Todo Server", |
4166 | "end": { | 4179 | "end": { |
4167 | "column": 3, | 4180 | "column": 3, |
4168 | "line": 72 | 4181 | "line": 76 |
4169 | }, | 4182 | }, |
4170 | "file": "src/containers/settings/EditSettingsScreen.js", | 4183 | "file": "src/containers/settings/EditSettingsScreen.js", |
4171 | "id": "settings.app.form.todoServer", | 4184 | "id": "settings.app.form.todoServer", |
4172 | "start": { | 4185 | "start": { |
4173 | "column": 14, | 4186 | "column": 14, |
4174 | "line": 69 | 4187 | "line": 73 |
4175 | } | 4188 | } |
4176 | }, | 4189 | }, |
4177 | { | 4190 | { |
4178 | "defaultMessage": "!!!Enable Ferdi password lock", | 4191 | "defaultMessage": "!!!Enable Ferdi password lock", |
4179 | "end": { | 4192 | "end": { |
4180 | "column": 3, | 4193 | "column": 3, |
4181 | "line": 76 | 4194 | "line": 80 |
4182 | }, | 4195 | }, |
4183 | "file": "src/containers/settings/EditSettingsScreen.js", | 4196 | "file": "src/containers/settings/EditSettingsScreen.js", |
4184 | "id": "settings.app.form.enableLock", | 4197 | "id": "settings.app.form.enableLock", |
4185 | "start": { | 4198 | "start": { |
4186 | "column": 14, | 4199 | "column": 14, |
4187 | "line": 73 | 4200 | "line": 77 |
4188 | } | 4201 | } |
4189 | }, | 4202 | }, |
4190 | { | 4203 | { |
4191 | "defaultMessage": "!!!Ferdi Lock password", | 4204 | "defaultMessage": "!!!Ferdi Lock password", |
4192 | "end": { | 4205 | "end": { |
4193 | "column": 3, | 4206 | "column": 3, |
4194 | "line": 80 | 4207 | "line": 84 |
4195 | }, | 4208 | }, |
4196 | "file": "src/containers/settings/EditSettingsScreen.js", | 4209 | "file": "src/containers/settings/EditSettingsScreen.js", |
4197 | "id": "settings.app.form.lockPassword", | 4210 | "id": "settings.app.form.lockPassword", |
4198 | "start": { | 4211 | "start": { |
4199 | "column": 16, | 4212 | "column": 16, |
4200 | "line": 77 | 4213 | "line": 81 |
4201 | } | 4214 | } |
4202 | }, | 4215 | }, |
4203 | { | 4216 | { |
4204 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", | 4217 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", |
4205 | "end": { | 4218 | "end": { |
4206 | "column": 3, | 4219 | "column": 3, |
4207 | "line": 84 | 4220 | "line": 88 |
4208 | }, | 4221 | }, |
4209 | "file": "src/containers/settings/EditSettingsScreen.js", | 4222 | "file": "src/containers/settings/EditSettingsScreen.js", |
4210 | "id": "settings.app.form.scheduledDNDEnabled", | 4223 | "id": "settings.app.form.scheduledDNDEnabled", |
4211 | "start": { | 4224 | "start": { |
4212 | "column": 23, | 4225 | "column": 23, |
4213 | "line": 81 | 4226 | "line": 85 |
4214 | } | 4227 | } |
4215 | }, | 4228 | }, |
4216 | { | 4229 | { |
4217 | "defaultMessage": "!!!From", | 4230 | "defaultMessage": "!!!From", |
4218 | "end": { | 4231 | "end": { |
4219 | "column": 3, | 4232 | "column": 3, |
4220 | "line": 88 | 4233 | "line": 92 |
4221 | }, | 4234 | }, |
4222 | "file": "src/containers/settings/EditSettingsScreen.js", | 4235 | "file": "src/containers/settings/EditSettingsScreen.js", |
4223 | "id": "settings.app.form.scheduledDNDStart", | 4236 | "id": "settings.app.form.scheduledDNDStart", |
4224 | "start": { | 4237 | "start": { |
4225 | "column": 21, | 4238 | "column": 21, |
4226 | "line": 85 | 4239 | "line": 89 |
4227 | } | 4240 | } |
4228 | }, | 4241 | }, |
4229 | { | 4242 | { |
4230 | "defaultMessage": "!!!To", | 4243 | "defaultMessage": "!!!To", |
4231 | "end": { | 4244 | "end": { |
4232 | "column": 3, | 4245 | "column": 3, |
4233 | "line": 92 | 4246 | "line": 96 |
4234 | }, | 4247 | }, |
4235 | "file": "src/containers/settings/EditSettingsScreen.js", | 4248 | "file": "src/containers/settings/EditSettingsScreen.js", |
4236 | "id": "settings.app.form.scheduledDNDEnd", | 4249 | "id": "settings.app.form.scheduledDNDEnd", |
4237 | "start": { | 4250 | "start": { |
4238 | "column": 19, | 4251 | "column": 19, |
4239 | "line": 89 | 4252 | "line": 93 |
4240 | } | 4253 | } |
4241 | }, | 4254 | }, |
4242 | { | 4255 | { |
4243 | "defaultMessage": "!!!Language", | 4256 | "defaultMessage": "!!!Language", |
4244 | "end": { | 4257 | "end": { |
4245 | "column": 3, | 4258 | "column": 3, |
4246 | "line": 96 | 4259 | "line": 100 |
4247 | }, | 4260 | }, |
4248 | "file": "src/containers/settings/EditSettingsScreen.js", | 4261 | "file": "src/containers/settings/EditSettingsScreen.js", |
4249 | "id": "settings.app.form.language", | 4262 | "id": "settings.app.form.language", |
4250 | "start": { | 4263 | "start": { |
4251 | "column": 12, | 4264 | "column": 12, |
4252 | "line": 93 | 4265 | "line": 97 |
4253 | } | 4266 | } |
4254 | }, | 4267 | }, |
4255 | { | 4268 | { |
4256 | "defaultMessage": "!!!Dark Mode", | 4269 | "defaultMessage": "!!!Dark Mode", |
4257 | "end": { | 4270 | "end": { |
4258 | "column": 3, | 4271 | "column": 3, |
4259 | "line": 100 | 4272 | "line": 104 |
4260 | }, | 4273 | }, |
4261 | "file": "src/containers/settings/EditSettingsScreen.js", | 4274 | "file": "src/containers/settings/EditSettingsScreen.js", |
4262 | "id": "settings.app.form.darkMode", | 4275 | "id": "settings.app.form.darkMode", |
4263 | "start": { | 4276 | "start": { |
4264 | "column": 12, | 4277 | "column": 12, |
4265 | "line": 97 | 4278 | "line": 101 |
4266 | } | 4279 | } |
4267 | }, | 4280 | }, |
4268 | { | 4281 | { |
4269 | "defaultMessage": "!!!Enable adaptable Dark Mode", | 4282 | "defaultMessage": "!!!Enable adaptable Dark Mode", |
4270 | "end": { | 4283 | "end": { |
4271 | "column": 3, | 4284 | "column": 3, |
4272 | "line": 104 | 4285 | "line": 108 |
4273 | }, | 4286 | }, |
4274 | "file": "src/containers/settings/EditSettingsScreen.js", | 4287 | "file": "src/containers/settings/EditSettingsScreen.js", |
4275 | "id": "settings.app.form.adaptableDarkMode", | 4288 | "id": "settings.app.form.adaptableDarkMode", |
4276 | "start": { | 4289 | "start": { |
4277 | "column": 21, | 4290 | "column": 21, |
4278 | "line": 101 | 4291 | "line": 105 |
4279 | } | 4292 | } |
4280 | }, | 4293 | }, |
4281 | { | 4294 | { |
4282 | "defaultMessage": "!!!Enable universal Dark Mode", | 4295 | "defaultMessage": "!!!Enable universal Dark Mode", |
4283 | "end": { | 4296 | "end": { |
4284 | "column": 3, | 4297 | "column": 3, |
4285 | "line": 108 | 4298 | "line": 112 |
4286 | }, | 4299 | }, |
4287 | "file": "src/containers/settings/EditSettingsScreen.js", | 4300 | "file": "src/containers/settings/EditSettingsScreen.js", |
4288 | "id": "settings.app.form.universalDarkMode", | 4301 | "id": "settings.app.form.universalDarkMode", |
4289 | "start": { | 4302 | "start": { |
4290 | "column": 21, | 4303 | "column": 21, |
4291 | "line": 105 | 4304 | "line": 109 |
4292 | } | 4305 | } |
4293 | }, | 4306 | }, |
4294 | { | 4307 | { |
4295 | "defaultMessage": "!!!Accent color", | 4308 | "defaultMessage": "!!!Accent color", |
4296 | "end": { | 4309 | "end": { |
4297 | "column": 3, | 4310 | "column": 3, |
4298 | "line": 112 | 4311 | "line": 116 |
4299 | }, | 4312 | }, |
4300 | "file": "src/containers/settings/EditSettingsScreen.js", | 4313 | "file": "src/containers/settings/EditSettingsScreen.js", |
4301 | "id": "settings.app.form.accentColor", | 4314 | "id": "settings.app.form.accentColor", |
4302 | "start": { | 4315 | "start": { |
4303 | "column": 15, | 4316 | "column": 15, |
4304 | "line": 109 | 4317 | "line": 113 |
4305 | } | 4318 | } |
4306 | }, | 4319 | }, |
4307 | { | 4320 | { |
4308 | "defaultMessage": "!!!Display disabled services tabs", | 4321 | "defaultMessage": "!!!Display disabled services tabs", |
4309 | "end": { | 4322 | "end": { |
4310 | "column": 3, | 4323 | "column": 3, |
4311 | "line": 116 | 4324 | "line": 120 |
4312 | }, | 4325 | }, |
4313 | "file": "src/containers/settings/EditSettingsScreen.js", | 4326 | "file": "src/containers/settings/EditSettingsScreen.js", |
4314 | "id": "settings.app.form.showDisabledServices", | 4327 | "id": "settings.app.form.showDisabledServices", |
4315 | "start": { | 4328 | "start": { |
4316 | "column": 24, | 4329 | "column": 24, |
4317 | "line": 113 | 4330 | "line": 117 |
4318 | } | 4331 | } |
4319 | }, | 4332 | }, |
4320 | { | 4333 | { |
4321 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 4334 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
4322 | "end": { | 4335 | "end": { |
4323 | "column": 3, | 4336 | "column": 3, |
4324 | "line": 120 | 4337 | "line": 124 |
4325 | }, | 4338 | }, |
4326 | "file": "src/containers/settings/EditSettingsScreen.js", | 4339 | "file": "src/containers/settings/EditSettingsScreen.js", |
4327 | "id": "settings.app.form.showMessagesBadgesWhenMuted", | 4340 | "id": "settings.app.form.showMessagesBadgesWhenMuted", |
4328 | "start": { | 4341 | "start": { |
4329 | "column": 29, | 4342 | "column": 29, |
4330 | "line": 117 | 4343 | "line": 121 |
4331 | } | 4344 | } |
4332 | }, | 4345 | }, |
4333 | { | 4346 | { |
4334 | "defaultMessage": "!!!Enable spell checking", | 4347 | "defaultMessage": "!!!Enable spell checking", |
4335 | "end": { | 4348 | "end": { |
4336 | "column": 3, | 4349 | "column": 3, |
4337 | "line": 124 | 4350 | "line": 128 |
4338 | }, | 4351 | }, |
4339 | "file": "src/containers/settings/EditSettingsScreen.js", | 4352 | "file": "src/containers/settings/EditSettingsScreen.js", |
4340 | "id": "settings.app.form.enableSpellchecking", | 4353 | "id": "settings.app.form.enableSpellchecking", |
4341 | "start": { | 4354 | "start": { |
4342 | "column": 23, | 4355 | "column": 23, |
4343 | "line": 121 | 4356 | "line": 125 |
4344 | } | 4357 | } |
4345 | }, | 4358 | }, |
4346 | { | 4359 | { |
4347 | "defaultMessage": "!!!Enable GPU Acceleration", | 4360 | "defaultMessage": "!!!Enable GPU Acceleration", |
4348 | "end": { | 4361 | "end": { |
4349 | "column": 3, | 4362 | "column": 3, |
4350 | "line": 128 | 4363 | "line": 132 |
4351 | }, | 4364 | }, |
4352 | "file": "src/containers/settings/EditSettingsScreen.js", | 4365 | "file": "src/containers/settings/EditSettingsScreen.js", |
4353 | "id": "settings.app.form.enableGPUAcceleration", | 4366 | "id": "settings.app.form.enableGPUAcceleration", |
4354 | "start": { | 4367 | "start": { |
4355 | "column": 25, | 4368 | "column": 25, |
4356 | "line": 125 | 4369 | "line": 129 |
4357 | } | 4370 | } |
4358 | }, | 4371 | }, |
4359 | { | 4372 | { |
4360 | "defaultMessage": "!!!Include beta versions", | 4373 | "defaultMessage": "!!!Include beta versions", |
4361 | "end": { | 4374 | "end": { |
4362 | "column": 3, | 4375 | "column": 3, |
4363 | "line": 132 | 4376 | "line": 136 |
4364 | }, | 4377 | }, |
4365 | "file": "src/containers/settings/EditSettingsScreen.js", | 4378 | "file": "src/containers/settings/EditSettingsScreen.js", |
4366 | "id": "settings.app.form.beta", | 4379 | "id": "settings.app.form.beta", |
4367 | "start": { | 4380 | "start": { |
4368 | "column": 8, | 4381 | "column": 8, |
4369 | "line": 129 | 4382 | "line": 133 |
4370 | } | 4383 | } |
4371 | }, | 4384 | }, |
4372 | { | 4385 | { |
4373 | "defaultMessage": "!!!Disable updates", | 4386 | "defaultMessage": "!!!Disable updates", |
4374 | "end": { | 4387 | "end": { |
4375 | "column": 3, | 4388 | "column": 3, |
4376 | "line": 136 | 4389 | "line": 140 |
4377 | }, | 4390 | }, |
4378 | "file": "src/containers/settings/EditSettingsScreen.js", | 4391 | "file": "src/containers/settings/EditSettingsScreen.js", |
4379 | "id": "settings.app.form.noUpdates", | 4392 | "id": "settings.app.form.noUpdates", |
4380 | "start": { | 4393 | "start": { |
4381 | "column": 13, | 4394 | "column": 13, |
4382 | "line": 133 | 4395 | "line": 137 |
4383 | } | 4396 | } |
4384 | }, | 4397 | }, |
4385 | { | 4398 | { |
4386 | "defaultMessage": "!!!Enable Franz Todos", | 4399 | "defaultMessage": "!!!Enable Franz Todos", |
4387 | "end": { | 4400 | "end": { |
4388 | "column": 3, | 4401 | "column": 3, |
4389 | "line": 140 | 4402 | "line": 144 |
4390 | }, | 4403 | }, |
4391 | "file": "src/containers/settings/EditSettingsScreen.js", | 4404 | "file": "src/containers/settings/EditSettingsScreen.js", |
4392 | "id": "settings.app.form.enableTodos", | 4405 | "id": "settings.app.form.enableTodos", |
4393 | "start": { | 4406 | "start": { |
4394 | "column": 15, | 4407 | "column": 15, |
4395 | "line": 137 | 4408 | "line": 141 |
4396 | } | 4409 | } |
4397 | }, | 4410 | }, |
4398 | { | 4411 | { |
4399 | "defaultMessage": "!!!Keep all workspaces loaded", | 4412 | "defaultMessage": "!!!Keep all workspaces loaded", |
4400 | "end": { | 4413 | "end": { |
4401 | "column": 3, | 4414 | "column": 3, |
4402 | "line": 144 | 4415 | "line": 148 |
4403 | }, | 4416 | }, |
4404 | "file": "src/containers/settings/EditSettingsScreen.js", | 4417 | "file": "src/containers/settings/EditSettingsScreen.js", |
4405 | "id": "settings.app.form.keepAllWorkspacesLoaded", | 4418 | "id": "settings.app.form.keepAllWorkspacesLoaded", |
4406 | "start": { | 4419 | "start": { |
4407 | "column": 27, | 4420 | "column": 27, |
4408 | "line": 141 | 4421 | "line": 145 |
4409 | } | 4422 | } |
4410 | } | 4423 | } |
4411 | ], | 4424 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index b7d81356e..5beb51495 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -281,6 +281,7 @@ | |||
281 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 281 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
282 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 282 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |
283 | "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", | 283 | "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", |
284 | "settings.app.form.startMinimized": "Start minimized", | ||
284 | "settings.app.form.todoServer": "Todo Server", | 285 | "settings.app.form.todoServer": "Todo Server", |
285 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", | 286 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", |
286 | "settings.app.headline": "Settings", | 287 | "settings.app.headline": "Settings", |
diff --git a/src/index.js b/src/index.js index 4c61c5c8e..69aae3dde 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -91,7 +91,7 @@ if (!gotTheLock) { | |||
91 | app.on('second-instance', (event, argv) => { | 91 | app.on('second-instance', (event, argv) => { |
92 | // Someone tried to run a second instance, we should focus our window. | 92 | // Someone tried to run a second instance, we should focus our window. |
93 | if (mainWindow) { | 93 | if (mainWindow) { |
94 | //mainWindow.show(); | 94 | mainWindow.show(); |
95 | if (mainWindow.isMinimized()) { | 95 | if (mainWindow.isMinimized()) { |
96 | mainWindow.restore(); | 96 | mainWindow.restore(); |
97 | } | 97 | } |
@@ -143,7 +143,7 @@ const createWindow = () => { | |||
143 | defaultWidth: DEFAULT_WINDOW_OPTIONS.width, | 143 | defaultWidth: DEFAULT_WINDOW_OPTIONS.width, |
144 | defaultHeight: DEFAULT_WINDOW_OPTIONS.height, | 144 | defaultHeight: DEFAULT_WINDOW_OPTIONS.height, |
145 | maximize: false, | 145 | maximize: false, |
146 | fullScreen: false | 146 | fullScreen: false, |
147 | }); | 147 | }); |
148 | 148 | ||
149 | let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; | 149 | let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; |
@@ -305,7 +305,6 @@ const createWindow = () => { | |||
305 | if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { | 305 | if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { |
306 | mainWindow.show(); | 306 | mainWindow.show(); |
307 | } | 307 | } |
308 | |||
309 | }; | 308 | }; |
310 | 309 | ||
311 | // Allow passing command line parameters/switches to electron | 310 | // Allow passing command line parameters/switches to electron |