diff options
author | Bennett <properly@protonmail.com> | 2019-09-17 12:20:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 12:20:57 +0200 |
commit | 4ec6e8625e9a1ea995cd1557a06c17ef0b0774bd (patch) | |
tree | 702a4a712e18befb543389aee4aabf308de03846 /src/i18n | |
parent | Implement #41 (diff) | |
parent | Merge pull request #44 from kytwb/issue-37 (diff) | |
download | ferdium-app-4ec6e8625e9a1ea995cd1557a06c17ef0b0774bd.tar.gz ferdium-app-4ec6e8625e9a1ea995cd1557a06c17ef0b0774bd.tar.zst ferdium-app-4ec6e8625e9a1ea995cd1557a06c17ef0b0774bd.zip |
Merge branch 'master' into issue-41
Diffstat (limited to 'src/i18n')
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 28 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 | ||||
-rw-r--r-- | src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json | 28 |
3 files changed, 30 insertions, 28 deletions
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index febdd0d53..ab1279964 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -4322,91 +4322,91 @@ | |||
4322 | "defaultMessage": "!!!Delete workspace", | 4322 | "defaultMessage": "!!!Delete workspace", |
4323 | "end": { | 4323 | "end": { |
4324 | "column": 3, | 4324 | "column": 3, |
4325 | "line": 20 | 4325 | "line": 24 |
4326 | }, | 4326 | }, |
4327 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4327 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4328 | "id": "settings.workspace.form.buttonDelete", | 4328 | "id": "settings.workspace.form.buttonDelete", |
4329 | "start": { | 4329 | "start": { |
4330 | "column": 16, | 4330 | "column": 16, |
4331 | "line": 17 | 4331 | "line": 21 |
4332 | } | 4332 | } |
4333 | }, | 4333 | }, |
4334 | { | 4334 | { |
4335 | "defaultMessage": "!!!Save workspace", | 4335 | "defaultMessage": "!!!Save workspace", |
4336 | "end": { | 4336 | "end": { |
4337 | "column": 3, | 4337 | "column": 3, |
4338 | "line": 24 | 4338 | "line": 28 |
4339 | }, | 4339 | }, |
4340 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4340 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4341 | "id": "settings.workspace.form.buttonSave", | 4341 | "id": "settings.workspace.form.buttonSave", |
4342 | "start": { | 4342 | "start": { |
4343 | "column": 14, | 4343 | "column": 14, |
4344 | "line": 21 | 4344 | "line": 25 |
4345 | } | 4345 | } |
4346 | }, | 4346 | }, |
4347 | { | 4347 | { |
4348 | "defaultMessage": "!!!Name", | 4348 | "defaultMessage": "!!!Name", |
4349 | "end": { | 4349 | "end": { |
4350 | "column": 3, | 4350 | "column": 3, |
4351 | "line": 28 | 4351 | "line": 32 |
4352 | }, | 4352 | }, |
4353 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4353 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4354 | "id": "settings.workspace.form.name", | 4354 | "id": "settings.workspace.form.name", |
4355 | "start": { | 4355 | "start": { |
4356 | "column": 8, | 4356 | "column": 8, |
4357 | "line": 25 | 4357 | "line": 29 |
4358 | } | 4358 | } |
4359 | }, | 4359 | }, |
4360 | { | 4360 | { |
4361 | "defaultMessage": "!!!Your workspaces", | 4361 | "defaultMessage": "!!!Your workspaces", |
4362 | "end": { | 4362 | "end": { |
4363 | "column": 3, | 4363 | "column": 3, |
4364 | "line": 32 | 4364 | "line": 36 |
4365 | }, | 4365 | }, |
4366 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4366 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4367 | "id": "settings.workspace.form.yourWorkspaces", | 4367 | "id": "settings.workspace.form.yourWorkspaces", |
4368 | "start": { | 4368 | "start": { |
4369 | "column": 18, | 4369 | "column": 18, |
4370 | "line": 29 | 4370 | "line": 33 |
4371 | } | 4371 | } |
4372 | }, | 4372 | }, |
4373 | { | 4373 | { |
4374 | "defaultMessage": "!!!Services in this Workspace", | 4374 | "defaultMessage": "!!!Services in this Workspace", |
4375 | "end": { | 4375 | "end": { |
4376 | "column": 3, | 4376 | "column": 3, |
4377 | "line": 36 | 4377 | "line": 40 |
4378 | }, | 4378 | }, |
4379 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4379 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4380 | "id": "settings.workspace.form.servicesInWorkspaceHeadline", | 4380 | "id": "settings.workspace.form.servicesInWorkspaceHeadline", |
4381 | "start": { | 4381 | "start": { |
4382 | "column": 31, | 4382 | "column": 31, |
4383 | "line": 33 | 4383 | "line": 37 |
4384 | } | 4384 | } |
4385 | }, | 4385 | }, |
4386 | { | 4386 | { |
4387 | "defaultMessage": "!!!You haven't added any services yet.", | 4387 | "defaultMessage": "!!!You haven't added any services yet.", |
4388 | "end": { | 4388 | "end": { |
4389 | "column": 3, | 4389 | "column": 3, |
4390 | "line": 40 | 4390 | "line": 44 |
4391 | }, | 4391 | }, |
4392 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4392 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4393 | "id": "settings.services.noServicesAdded", | 4393 | "id": "settings.services.noServicesAdded", |
4394 | "start": { | 4394 | "start": { |
4395 | "column": 19, | 4395 | "column": 19, |
4396 | "line": 37 | 4396 | "line": 41 |
4397 | } | 4397 | } |
4398 | }, | 4398 | }, |
4399 | { | 4399 | { |
4400 | "defaultMessage": "!!!Discover services", | 4400 | "defaultMessage": "!!!Discover services", |
4401 | "end": { | 4401 | "end": { |
4402 | "column": 3, | 4402 | "column": 3, |
4403 | "line": 44 | 4403 | "line": 48 |
4404 | }, | 4404 | }, |
4405 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 4405 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
4406 | "id": "settings.services.discoverServices", | 4406 | "id": "settings.services.discoverServices", |
4407 | "start": { | 4407 | "start": { |
4408 | "column": 20, | 4408 | "column": 20, |
4409 | "line": 41 | 4409 | "line": 45 |
4410 | } | 4410 | } |
4411 | } | 4411 | } |
4412 | ], | 4412 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fb1d84cb6..122739d03 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -341,6 +341,8 @@ | |||
341 | "settings.workspace.add.form.submitButton": "Create workspace", | 341 | "settings.workspace.add.form.submitButton": "Create workspace", |
342 | "settings.workspace.form.buttonDelete": "Delete workspace", | 342 | "settings.workspace.form.buttonDelete": "Delete workspace", |
343 | "settings.workspace.form.buttonSave": "Save workspace", | 343 | "settings.workspace.form.buttonSave": "Save workspace", |
344 | "settings.workspace.form.keepLoaded": "Keep this workspace loaded*", | ||
345 | "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.", | ||
344 | "settings.workspace.form.name": "Name", | 346 | "settings.workspace.form.name": "Name", |
345 | "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace", | 347 | "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace", |
346 | "settings.workspace.form.yourWorkspaces": "Your workspaces", | 348 | "settings.workspace.form.yourWorkspaces": "Your workspaces", |
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json index 61abf8ba0..5bb13a415 100644 --- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json +++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json | |||
@@ -4,11 +4,11 @@ | |||
4 | "defaultMessage": "!!!Delete workspace", | 4 | "defaultMessage": "!!!Delete workspace", |
5 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 5 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 17, | 7 | "line": 21, |
8 | "column": 16 | 8 | "column": 16 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 20, | 11 | "line": 24, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Save workspace", | 17 | "defaultMessage": "!!!Save workspace", |
18 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 18 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 21, | 20 | "line": 25, |
21 | "column": 14 | 21 | "column": 14 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 24, | 24 | "line": 28, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Name", | 30 | "defaultMessage": "!!!Name", |
31 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 31 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 25, | 33 | "line": 29, |
34 | "column": 8 | 34 | "column": 8 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 28, | 37 | "line": 32, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -43,11 +43,11 @@ | |||
43 | "defaultMessage": "!!!Your workspaces", | 43 | "defaultMessage": "!!!Your workspaces", |
44 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 44 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 29, | 46 | "line": 33, |
47 | "column": 18 | 47 | "column": 18 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 32, | 50 | "line": 36, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
@@ -56,11 +56,11 @@ | |||
56 | "defaultMessage": "!!!Services in this Workspace", | 56 | "defaultMessage": "!!!Services in this Workspace", |
57 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 57 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 33, | 59 | "line": 37, |
60 | "column": 31 | 60 | "column": 31 |
61 | }, | 61 | }, |
62 | "end": { | 62 | "end": { |
63 | "line": 36, | 63 | "line": 40, |
64 | "column": 3 | 64 | "column": 3 |
65 | } | 65 | } |
66 | }, | 66 | }, |
@@ -69,11 +69,11 @@ | |||
69 | "defaultMessage": "!!!You haven't added any services yet.", | 69 | "defaultMessage": "!!!You haven't added any services yet.", |
70 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 70 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
71 | "start": { | 71 | "start": { |
72 | "line": 37, | 72 | "line": 41, |
73 | "column": 19 | 73 | "column": 19 |
74 | }, | 74 | }, |
75 | "end": { | 75 | "end": { |
76 | "line": 40, | 76 | "line": 44, |
77 | "column": 3 | 77 | "column": 3 |
78 | } | 78 | } |
79 | }, | 79 | }, |
@@ -82,11 +82,11 @@ | |||
82 | "defaultMessage": "!!!Discover services", | 82 | "defaultMessage": "!!!Discover services", |
83 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 83 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
84 | "start": { | 84 | "start": { |
85 | "line": 41, | 85 | "line": 45, |
86 | "column": 20 | 86 | "column": 20 |
87 | }, | 87 | }, |
88 | "end": { | 88 | "end": { |
89 | "line": 44, | 89 | "line": 48, |
90 | "column": 3 | 90 | "column": 3 |
91 | } | 91 | } |
92 | } | 92 | } |