Merge ef49987 into c522ca3

nextcloud · Jun 2, 2021 · 4312bd6 · 4312bd6
2 parents c522ca3 + ef49987
commit 4312bd6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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