summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2021-06-03 09:33:08 +0200
committerGitHub <noreply@github.com>2021-06-03 09:33:08 +0200
commit9c9b506aad3958e8dab872c9a4364c2b24564ea2 (patch)
tree8de3d75cb59673b0adebe1cae26bb28ba489a3e7
parent948bf9f38a7d90a44f29f53b8e3baac90b86925c (diff)
parentef4998745f7becdab35d76eb4bcec3090c7c4d5a (diff)
Merge pull request #2244 from nextcloud/Valdnet-patch-1
l10n: Correct spelling
-rw-r--r--src/components/AppNavigation/Settings/SettingsAddressbook.vue2
-rw-r--r--src/components/EntityPicker/NewCircleIntro.vue2
-rw-r--r--src/mixins/CircleActionsMixin.js4
-rw-r--r--src/models/constants.ts2
-rw-r--r--src/store/circles.js2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/components/AppNavigation/Settings/SettingsAddressbook.vue b/src/components/AppNavigation/Settings/SettingsAddressbook.vue
index 16625bfe..b3226733 100644
--- a/src/components/AppNavigation/Settings/SettingsAddressbook.vue
+++ b/src/components/AppNavigation/Settings/SettingsAddressbook.vue
@@ -215,7 +215,7 @@ export default {
confirmDeletion() {
OC.dialogs.confirm(
t('contacts', 'This will delete the address book and every contacts within it'),
- t('contacts', 'Delete {addressbook} ?', { addressbook: this.addressbook.displayName }),
+ t('contacts', 'Delete {addressbook}?', { addressbook: this.addressbook.displayName }),
this.deleteAddressbook,
true
)
diff --git a/src/components/EntityPicker/NewCircleIntro.vue b/src/components/EntityPicker/NewCircleIntro.vue
index ab56faf0..b5300e91 100644
--- a/src/components/EntityPicker/NewCircleIntro.vue
+++ b/src/components/EntityPicker/NewCircleIntro.vue
@@ -58,7 +58,7 @@
{{ t('contacts', 'Local circle') }}
</CheckboxRadioSwitch>
<p>
- {{ t('contacts', 'This circle will not be shared with the other instances of the GlobalScale') }}
+ {{ t('contacts', 'This circle will not be shared with the other instances of the global scale') }}
</p>
</template>
</div>
diff --git a/src/mixins/CircleActionsMixin.js b/src/mixins/CircleActionsMixin.js
index a11cc1c0..2bc0cc84 100644
--- a/src/mixins/CircleActionsMixin.js
+++ b/src/mixins/CircleActionsMixin.js
@@ -69,7 +69,7 @@ export default {
methods: {
confirmLeaveCircle() {
OC.dialogs.confirmDestructive(
- t('contacts', 'You are about to leave {circle}.\n Are you sure ?', {
+ t('contacts', 'You are about to leave {circle}.\nAre you sure?', {
circle: this.circle.displayName,
}),
t('contacts', 'Please confirm circle leave'),
@@ -115,7 +115,7 @@ export default {
confirmDeleteCircle() {
OC.dialogs.confirmDestructive(
- t('contacts', 'You are about to delete {circle}.\n Are you sure ?', {
+ t('contacts', 'You are about to delete {circle}.\nAre you sure?', {
circle: this.circle.displayName,
}),
t('contacts', 'Please confirm circle deletion'),
diff --git a/src/models/constants.ts b/src/models/constants.ts
index f08b0e7b..99a262aa 100644
--- a/src/models/constants.ts
+++ b/src/models/constants.ts
@@ -80,7 +80,7 @@ export const CIRCLES_MEMBER_TYPES = {
[MEMBER_TYPE_CIRCLE]: t('circles', 'Circle'),
[MEMBER_TYPE_USER]: t('circles', 'User'),
[MEMBER_TYPE_GROUP]: t('circles', 'Group'),
- [MEMBER_TYPE_MAIL]: t('circles', 'Mail'),
+ [MEMBER_TYPE_MAIL]: t('circles', 'Email'),
[MEMBER_TYPE_CONTACT]: t('circles', 'Contact'),
}
diff --git a/src/store/circles.js b/src/store/circles.js
index 0a328bec..c6ac69ea 100644
--- a/src/store/circles.js
+++ b/src/store/circles.js
@@ -124,7 +124,7 @@ const actions = {
})
if (failure) {
- showError(t('contacts', 'Some circle(s) errored, check the console for more details'))
+ showError(t('contacts', 'Some circle(s) an error occurred. Check the console for more details.'))
}
return circles