diff options
author | Marouane Rassili <mrassili@aol.com> | 2020-03-29 16:22:22 +0100 |
---|---|---|
committer | Marouane Rassili <mrassili@aol.com> | 2020-03-29 16:23:46 +0100 |
commit | a9b35634aac673136fc5703bdc8eeb310a372bd2 (patch) | |
tree | 1b0d2e500830b72366fb40805c819fb0418a3758 /src | |
parent | Clean up unused locales and props (diff) | |
parent | Remove server setting from settings screen (diff) | |
download | ferdium-app-a9b35634aac673136fc5703bdc8eeb310a372bd2.tar.gz ferdium-app-a9b35634aac673136fc5703bdc8eeb310a372bd2.tar.zst ferdium-app-a9b35634aac673136fc5703bdc8eeb310a372bd2.zip |
Merge branch 'fix/remove-server-setting' of github.com:mrassili/ferdi into fix/remove-server-setting
Diffstat (limited to 'src')
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 105 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 |
2 files changed, 46 insertions, 60 deletions
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 47bda3b1e..a5c83d7ab 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -4336,315 +4336,302 @@ | |||
4336 | } | 4336 | } |
4337 | }, | 4337 | }, |
4338 | { | 4338 | { |
4339 | "defaultMessage": "!!!Server", | ||
4340 | "end": { | ||
4341 | "column": 3, | ||
4342 | "line": 82 | ||
4343 | }, | ||
4344 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
4345 | "id": "settings.app.form.server", | ||
4346 | "start": { | ||
4347 | "column": 10, | ||
4348 | "line": 79 | ||
4349 | } | ||
4350 | }, | ||
4351 | { | ||
4352 | "defaultMessage": "!!!Todo Server", | 4339 | "defaultMessage": "!!!Todo Server", |
4353 | "end": { | 4340 | "end": { |
4354 | "column": 3, | 4341 | "column": 3, |
4355 | "line": 86 | 4342 | "line": 82 |
4356 | }, | 4343 | }, |
4357 | "file": "src/containers/settings/EditSettingsScreen.js", | 4344 | "file": "src/containers/settings/EditSettingsScreen.js", |
4358 | "id": "settings.app.form.todoServer", | 4345 | "id": "settings.app.form.todoServer", |
4359 | "start": { | 4346 | "start": { |
4360 | "column": 14, | 4347 | "column": 14, |
4361 | "line": 83 | 4348 | "line": 79 |
4362 | } | 4349 | } |
4363 | }, | 4350 | }, |
4364 | { | 4351 | { |
4365 | "defaultMessage": "!!!Enable Password Lock", | 4352 | "defaultMessage": "!!!Enable Password Lock", |
4366 | "end": { | 4353 | "end": { |
4367 | "column": 3, | 4354 | "column": 3, |
4368 | "line": 90 | 4355 | "line": 86 |
4369 | }, | 4356 | }, |
4370 | "file": "src/containers/settings/EditSettingsScreen.js", | 4357 | "file": "src/containers/settings/EditSettingsScreen.js", |
4371 | "id": "settings.app.form.enableLock", | 4358 | "id": "settings.app.form.enableLock", |
4372 | "start": { | 4359 | "start": { |
4373 | "column": 14, | 4360 | "column": 14, |
4374 | "line": 87 | 4361 | "line": 83 |
4375 | } | 4362 | } |
4376 | }, | 4363 | }, |
4377 | { | 4364 | { |
4378 | "defaultMessage": "!!!Password", | 4365 | "defaultMessage": "!!!Password", |
4379 | "end": { | 4366 | "end": { |
4380 | "column": 3, | 4367 | "column": 3, |
4381 | "line": 94 | 4368 | "line": 90 |
4382 | }, | 4369 | }, |
4383 | "file": "src/containers/settings/EditSettingsScreen.js", | 4370 | "file": "src/containers/settings/EditSettingsScreen.js", |
4384 | "id": "settings.app.form.lockPassword", | 4371 | "id": "settings.app.form.lockPassword", |
4385 | "start": { | 4372 | "start": { |
4386 | "column": 16, | 4373 | "column": 16, |
4387 | "line": 91 | 4374 | "line": 87 |
4388 | } | 4375 | } |
4389 | }, | 4376 | }, |
4390 | { | 4377 | { |
4391 | "defaultMessage": "!!!Allow using Touch ID to unlock", | 4378 | "defaultMessage": "!!!Allow using Touch ID to unlock", |
4392 | "end": { | 4379 | "end": { |
4393 | "column": 3, | 4380 | "column": 3, |
4394 | "line": 98 | 4381 | "line": 94 |
4395 | }, | 4382 | }, |
4396 | "file": "src/containers/settings/EditSettingsScreen.js", | 4383 | "file": "src/containers/settings/EditSettingsScreen.js", |
4397 | "id": "settings.app.form.useTouchIdToUnlock", | 4384 | "id": "settings.app.form.useTouchIdToUnlock", |
4398 | "start": { | 4385 | "start": { |
4399 | "column": 22, | 4386 | "column": 22, |
4400 | "line": 95 | 4387 | "line": 91 |
4401 | } | 4388 | } |
4402 | }, | 4389 | }, |
4403 | { | 4390 | { |
4404 | "defaultMessage": "!!!Lock after inactivity", | 4391 | "defaultMessage": "!!!Lock after inactivity", |
4405 | "end": { | 4392 | "end": { |
4406 | "column": 3, | 4393 | "column": 3, |
4407 | "line": 102 | 4394 | "line": 98 |
4408 | }, | 4395 | }, |
4409 | "file": "src/containers/settings/EditSettingsScreen.js", | 4396 | "file": "src/containers/settings/EditSettingsScreen.js", |
4410 | "id": "settings.app.form.inactivityLock", | 4397 | "id": "settings.app.form.inactivityLock", |
4411 | "start": { | 4398 | "start": { |
4412 | "column": 18, | 4399 | "column": 18, |
4413 | "line": 99 | 4400 | "line": 95 |
4414 | } | 4401 | } |
4415 | }, | 4402 | }, |
4416 | { | 4403 | { |
4417 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", | 4404 | "defaultMessage": "!!!Enable scheduled Do-not-Disturb", |
4418 | "end": { | 4405 | "end": { |
4419 | "column": 3, | 4406 | "column": 3, |
4420 | "line": 106 | 4407 | "line": 102 |
4421 | }, | 4408 | }, |
4422 | "file": "src/containers/settings/EditSettingsScreen.js", | 4409 | "file": "src/containers/settings/EditSettingsScreen.js", |
4423 | "id": "settings.app.form.scheduledDNDEnabled", | 4410 | "id": "settings.app.form.scheduledDNDEnabled", |
4424 | "start": { | 4411 | "start": { |
4425 | "column": 23, | 4412 | "column": 23, |
4426 | "line": 103 | 4413 | "line": 99 |
4427 | } | 4414 | } |
4428 | }, | 4415 | }, |
4429 | { | 4416 | { |
4430 | "defaultMessage": "!!!From", | 4417 | "defaultMessage": "!!!From", |
4431 | "end": { | 4418 | "end": { |
4432 | "column": 3, | 4419 | "column": 3, |
4433 | "line": 110 | 4420 | "line": 106 |
4434 | }, | 4421 | }, |
4435 | "file": "src/containers/settings/EditSettingsScreen.js", | 4422 | "file": "src/containers/settings/EditSettingsScreen.js", |
4436 | "id": "settings.app.form.scheduledDNDStart", | 4423 | "id": "settings.app.form.scheduledDNDStart", |
4437 | "start": { | 4424 | "start": { |
4438 | "column": 21, | 4425 | "column": 21, |
4439 | "line": 107 | 4426 | "line": 103 |
4440 | } | 4427 | } |
4441 | }, | 4428 | }, |
4442 | { | 4429 | { |
4443 | "defaultMessage": "!!!To", | 4430 | "defaultMessage": "!!!To", |
4444 | "end": { | 4431 | "end": { |
4445 | "column": 3, | 4432 | "column": 3, |
4446 | "line": 114 | 4433 | "line": 110 |
4447 | }, | 4434 | }, |
4448 | "file": "src/containers/settings/EditSettingsScreen.js", | 4435 | "file": "src/containers/settings/EditSettingsScreen.js", |
4449 | "id": "settings.app.form.scheduledDNDEnd", | 4436 | "id": "settings.app.form.scheduledDNDEnd", |
4450 | "start": { | 4437 | "start": { |
4451 | "column": 19, | 4438 | "column": 19, |
4452 | "line": 111 | 4439 | "line": 107 |
4453 | } | 4440 | } |
4454 | }, | 4441 | }, |
4455 | { | 4442 | { |
4456 | "defaultMessage": "!!!Language", | 4443 | "defaultMessage": "!!!Language", |
4457 | "end": { | 4444 | "end": { |
4458 | "column": 3, | 4445 | "column": 3, |
4459 | "line": 118 | 4446 | "line": 114 |
4460 | }, | 4447 | }, |
4461 | "file": "src/containers/settings/EditSettingsScreen.js", | 4448 | "file": "src/containers/settings/EditSettingsScreen.js", |
4462 | "id": "settings.app.form.language", | 4449 | "id": "settings.app.form.language", |
4463 | "start": { | 4450 | "start": { |
4464 | "column": 12, | 4451 | "column": 12, |
4465 | "line": 115 | 4452 | "line": 111 |
4466 | } | 4453 | } |
4467 | }, | 4454 | }, |
4468 | { | 4455 | { |
4469 | "defaultMessage": "!!!Dark Mode", | 4456 | "defaultMessage": "!!!Dark Mode", |
4470 | "end": { | 4457 | "end": { |
4471 | "column": 3, | 4458 | "column": 3, |
4472 | "line": 122 | 4459 | "line": 118 |
4473 | }, | 4460 | }, |
4474 | "file": "src/containers/settings/EditSettingsScreen.js", | 4461 | "file": "src/containers/settings/EditSettingsScreen.js", |
4475 | "id": "settings.app.form.darkMode", | 4462 | "id": "settings.app.form.darkMode", |
4476 | "start": { | 4463 | "start": { |
4477 | "column": 12, | 4464 | "column": 12, |
4478 | "line": 119 | 4465 | "line": 115 |
4479 | } | 4466 | } |
4480 | }, | 4467 | }, |
4481 | { | 4468 | { |
4482 | "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", | 4469 | "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", |
4483 | "end": { | 4470 | "end": { |
4484 | "column": 3, | 4471 | "column": 3, |
4485 | "line": 126 | 4472 | "line": 122 |
4486 | }, | 4473 | }, |
4487 | "file": "src/containers/settings/EditSettingsScreen.js", | 4474 | "file": "src/containers/settings/EditSettingsScreen.js", |
4488 | "id": "settings.app.form.adaptableDarkMode", | 4475 | "id": "settings.app.form.adaptableDarkMode", |
4489 | "start": { | 4476 | "start": { |
4490 | "column": 21, | 4477 | "column": 21, |
4491 | "line": 123 | 4478 | "line": 119 |
4492 | } | 4479 | } |
4493 | }, | 4480 | }, |
4494 | { | 4481 | { |
4495 | "defaultMessage": "!!!Enable universal Dark Mode", | 4482 | "defaultMessage": "!!!Enable universal Dark Mode", |
4496 | "end": { | 4483 | "end": { |
4497 | "column": 3, | 4484 | "column": 3, |
4498 | "line": 130 | 4485 | "line": 126 |
4499 | }, | 4486 | }, |
4500 | "file": "src/containers/settings/EditSettingsScreen.js", | 4487 | "file": "src/containers/settings/EditSettingsScreen.js", |
4501 | "id": "settings.app.form.universalDarkMode", | 4488 | "id": "settings.app.form.universalDarkMode", |
4502 | "start": { | 4489 | "start": { |
4503 | "column": 21, | 4490 | "column": 21, |
4504 | "line": 127 | 4491 | "line": 123 |
4505 | } | 4492 | } |
4506 | }, | 4493 | }, |
4507 | { | 4494 | { |
4508 | "defaultMessage": "!!!Sidebar width", | 4495 | "defaultMessage": "!!!Sidebar width", |
4509 | "end": { | 4496 | "end": { |
4510 | "column": 3, | 4497 | "column": 3, |
4511 | "line": 134 | 4498 | "line": 130 |
4512 | }, | 4499 | }, |
4513 | "file": "src/containers/settings/EditSettingsScreen.js", | 4500 | "file": "src/containers/settings/EditSettingsScreen.js", |
4514 | "id": "settings.app.form.serviceRibbonWidth", | 4501 | "id": "settings.app.form.serviceRibbonWidth", |
4515 | "start": { | 4502 | "start": { |
4516 | "column": 22, | 4503 | "column": 22, |
4517 | "line": 131 | 4504 | "line": 127 |
4518 | } | 4505 | } |
4519 | }, | 4506 | }, |
4520 | { | 4507 | { |
4521 | "defaultMessage": "!!!Service icon size", | 4508 | "defaultMessage": "!!!Service icon size", |
4522 | "end": { | 4509 | "end": { |
4523 | "column": 3, | 4510 | "column": 3, |
4524 | "line": 138 | 4511 | "line": 134 |
4525 | }, | 4512 | }, |
4526 | "file": "src/containers/settings/EditSettingsScreen.js", | 4513 | "file": "src/containers/settings/EditSettingsScreen.js", |
4527 | "id": "settings.app.form.iconSize", | 4514 | "id": "settings.app.form.iconSize", |
4528 | "start": { | 4515 | "start": { |
4529 | "column": 12, | 4516 | "column": 12, |
4530 | "line": 135 | 4517 | "line": 131 |
4531 | } | 4518 | } |
4532 | }, | 4519 | }, |
4533 | { | 4520 | { |
4534 | "defaultMessage": "!!!Accent color", | 4521 | "defaultMessage": "!!!Accent color", |
4535 | "end": { | 4522 | "end": { |
4536 | "column": 3, | 4523 | "column": 3, |
4537 | "line": 142 | 4524 | "line": 138 |
4538 | }, | 4525 | }, |
4539 | "file": "src/containers/settings/EditSettingsScreen.js", | 4526 | "file": "src/containers/settings/EditSettingsScreen.js", |
4540 | "id": "settings.app.form.accentColor", | 4527 | "id": "settings.app.form.accentColor", |
4541 | "start": { | 4528 | "start": { |
4542 | "column": 15, | 4529 | "column": 15, |
4543 | "line": 139 | 4530 | "line": 135 |
4544 | } | 4531 | } |
4545 | }, | 4532 | }, |
4546 | { | 4533 | { |
4547 | "defaultMessage": "!!!Display disabled services tabs", | 4534 | "defaultMessage": "!!!Display disabled services tabs", |
4548 | "end": { | 4535 | "end": { |
4549 | "column": 3, | 4536 | "column": 3, |
4550 | "line": 146 | 4537 | "line": 142 |
4551 | }, | 4538 | }, |
4552 | "file": "src/containers/settings/EditSettingsScreen.js", | 4539 | "file": "src/containers/settings/EditSettingsScreen.js", |
4553 | "id": "settings.app.form.showDisabledServices", | 4540 | "id": "settings.app.form.showDisabledServices", |
4554 | "start": { | 4541 | "start": { |
4555 | "column": 24, | 4542 | "column": 24, |
4556 | "line": 143 | 4543 | "line": 139 |
4557 | } | 4544 | } |
4558 | }, | 4545 | }, |
4559 | { | 4546 | { |
4560 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 4547 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
4561 | "end": { | 4548 | "end": { |
4562 | "column": 3, | 4549 | "column": 3, |
4563 | "line": 150 | 4550 | "line": 146 |
4564 | }, | 4551 | }, |
4565 | "file": "src/containers/settings/EditSettingsScreen.js", | 4552 | "file": "src/containers/settings/EditSettingsScreen.js", |
4566 | "id": "settings.app.form.showMessagesBadgesWhenMuted", | 4553 | "id": "settings.app.form.showMessagesBadgesWhenMuted", |
4567 | "start": { | 4554 | "start": { |
4568 | "column": 29, | 4555 | "column": 29, |
4569 | "line": 147 | 4556 | "line": 143 |
4570 | } | 4557 | } |
4571 | }, | 4558 | }, |
4572 | { | 4559 | { |
4573 | "defaultMessage": "!!!Enable spell checking", | 4560 | "defaultMessage": "!!!Enable spell checking", |
4574 | "end": { | 4561 | "end": { |
4575 | "column": 3, | 4562 | "column": 3, |
4576 | "line": 154 | 4563 | "line": 150 |
4577 | }, | 4564 | }, |
4578 | "file": "src/containers/settings/EditSettingsScreen.js", | 4565 | "file": "src/containers/settings/EditSettingsScreen.js", |
4579 | "id": "settings.app.form.enableSpellchecking", | 4566 | "id": "settings.app.form.enableSpellchecking", |
4580 | "start": { | 4567 | "start": { |
4581 | "column": 23, | 4568 | "column": 23, |
4582 | "line": 151 | 4569 | "line": 147 |
4583 | } | 4570 | } |
4584 | }, | 4571 | }, |
4585 | { | 4572 | { |
4586 | "defaultMessage": "!!!Enable GPU Acceleration", | 4573 | "defaultMessage": "!!!Enable GPU Acceleration", |
4587 | "end": { | 4574 | "end": { |
4588 | "column": 3, | 4575 | "column": 3, |
4589 | "line": 158 | 4576 | "line": 154 |
4590 | }, | 4577 | }, |
4591 | "file": "src/containers/settings/EditSettingsScreen.js", | 4578 | "file": "src/containers/settings/EditSettingsScreen.js", |
4592 | "id": "settings.app.form.enableGPUAcceleration", | 4579 | "id": "settings.app.form.enableGPUAcceleration", |
4593 | "start": { | 4580 | "start": { |
4594 | "column": 25, | 4581 | "column": 25, |
4595 | "line": 155 | 4582 | "line": 151 |
4596 | } | 4583 | } |
4597 | }, | 4584 | }, |
4598 | { | 4585 | { |
4599 | "defaultMessage": "!!!Include beta versions", | 4586 | "defaultMessage": "!!!Include beta versions", |
4600 | "end": { | 4587 | "end": { |
4601 | "column": 3, | 4588 | "column": 3, |
4602 | "line": 162 | 4589 | "line": 158 |
4603 | }, | 4590 | }, |
4604 | "file": "src/containers/settings/EditSettingsScreen.js", | 4591 | "file": "src/containers/settings/EditSettingsScreen.js", |
4605 | "id": "settings.app.form.beta", | 4592 | "id": "settings.app.form.beta", |
4606 | "start": { | 4593 | "start": { |
4607 | "column": 8, | 4594 | "column": 8, |
4608 | "line": 159 | 4595 | "line": 155 |
4609 | } | 4596 | } |
4610 | }, | 4597 | }, |
4611 | { | 4598 | { |
4612 | "defaultMessage": "!!!Disable updates", | 4599 | "defaultMessage": "!!!Disable updates", |
4613 | "end": { | 4600 | "end": { |
4614 | "column": 3, | 4601 | "column": 3, |
4615 | "line": 166 | 4602 | "line": 162 |
4616 | }, | 4603 | }, |
4617 | "file": "src/containers/settings/EditSettingsScreen.js", | 4604 | "file": "src/containers/settings/EditSettingsScreen.js", |
4618 | "id": "settings.app.form.noUpdates", | 4605 | "id": "settings.app.form.noUpdates", |
4619 | "start": { | 4606 | "start": { |
4620 | "column": 13, | 4607 | "column": 13, |
4621 | "line": 163 | 4608 | "line": 159 |
4622 | } | 4609 | } |
4623 | }, | 4610 | }, |
4624 | { | 4611 | { |
4625 | "defaultMessage": "!!!Enable Franz Todos", | 4612 | "defaultMessage": "!!!Enable Franz Todos", |
4626 | "end": { | 4613 | "end": { |
4627 | "column": 3, | 4614 | "column": 3, |
4628 | "line": 170 | 4615 | "line": 166 |
4629 | }, | 4616 | }, |
4630 | "file": "src/containers/settings/EditSettingsScreen.js", | 4617 | "file": "src/containers/settings/EditSettingsScreen.js", |
4631 | "id": "settings.app.form.enableTodos", | 4618 | "id": "settings.app.form.enableTodos", |
4632 | "start": { | 4619 | "start": { |
4633 | "column": 15, | 4620 | "column": 15, |
4634 | "line": 167 | 4621 | "line": 163 |
4635 | } | 4622 | } |
4636 | }, | 4623 | }, |
4637 | { | 4624 | { |
4638 | "defaultMessage": "!!!Keep all workspaces loaded", | 4625 | "defaultMessage": "!!!Keep all workspaces loaded", |
4639 | "end": { | 4626 | "end": { |
4640 | "column": 3, | 4627 | "column": 3, |
4641 | "line": 174 | 4628 | "line": 170 |
4642 | }, | 4629 | }, |
4643 | "file": "src/containers/settings/EditSettingsScreen.js", | 4630 | "file": "src/containers/settings/EditSettingsScreen.js", |
4644 | "id": "settings.app.form.keepAllWorkspacesLoaded", | 4631 | "id": "settings.app.form.keepAllWorkspacesLoaded", |
4645 | "start": { | 4632 | "start": { |
4646 | "column": 27, | 4633 | "column": 27, |
4647 | "line": 171 | 4634 | "line": 167 |
4648 | } | 4635 | } |
4649 | } | 4636 | } |
4650 | ], | 4637 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 20b785fed..0762e855f 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -300,7 +300,6 @@ | |||
300 | "settings.app.form.scheduledDNDEnd": "To", | 300 | "settings.app.form.scheduledDNDEnd": "To", |
301 | "settings.app.form.scheduledDNDStart": "From", | 301 | "settings.app.form.scheduledDNDStart": "From", |
302 | "settings.app.form.sentry": "Send telemetry data", | 302 | "settings.app.form.sentry": "Send telemetry data", |
303 | "settings.app.form.server": "Server", | ||
304 | "settings.app.form.serviceRibbonWidth": "Sidebar width", | 303 | "settings.app.form.serviceRibbonWidth": "Sidebar width", |
305 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 304 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
306 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 305 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |