diff --git a/app/assets/javascripts/app/controllers/_application_controller/_modal.coffee b/app/assets/javascripts/app/controllers/_application_controller/_modal.coffee
index 878fb29ff..d12ba79cf 100644
--- a/app/assets/javascripts/app/controllers/_application_controller/_modal.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/_modal.coffee
@@ -59,7 +59,9 @@ class App.ControllerModal extends App.Controller
false
content: ->
- __('You need to implement a one @content()!')
+ # coffeelint: disable=detect_translatable_string
+ "You need to implement a '@content()' method!"
+ # coffeelint: enable=detect_translatable_string
update: =>
if @message
diff --git a/app/assets/javascripts/app/controllers/_application_controller/generic_edit.coffee b/app/assets/javascripts/app/controllers/_application_controller/generic_edit.coffee
index eb01ec94b..9e85078e1 100644
--- a/app/assets/javascripts/app/controllers/_application_controller/generic_edit.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/generic_edit.coffee
@@ -51,5 +51,5 @@ class App.ControllerGenericEdit extends App.ControllerModal
App[ ui.genericObject ].fetch(id: @id)
ui.log 'errors'
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to update object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be updated.'))
)
diff --git a/app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee b/app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee
index 9f0023e45..023f91835 100644
--- a/app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee
@@ -51,5 +51,5 @@ class App.ControllerGenericNew extends App.ControllerModal
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to create object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be created.'))
)
diff --git a/app/assets/javascripts/app/controllers/_channel/_email_signature.coffee b/app/assets/javascripts/app/controllers/_channel/_email_signature.coffee
index c5f83bb06..b6444f7d8 100644
--- a/app/assets/javascripts/app/controllers/_channel/_email_signature.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/_email_signature.coffee
@@ -12,9 +12,9 @@ class App.ChannelEmailSignature extends App.Controller
template = $( '' )
description = __('''
-You can define different signatures for each group. So you can have different email signatures for different departments.
+You can define different signatures for each group, which allows you to use a different signature for every department.
-Once you have created a signature here, you need also to edit the groups where you want to use it.
+Once you have created a signature here, you will also need to edit the groups where you want to use it.
''')
new App.ControllerTable(
@@ -90,5 +90,5 @@ class ChannelEmailSignatureEdit extends App.ControllerModal
fail: (settings, details) =>
@log 'errors', details
@formEnable(e)
- @form.showAlert(details.error_human || details.error || __('Unable to create object!'))
+ @form.showAlert(details.error_human || details.error || __('The object could not be created.'))
)
diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee
index 1990564b5..ab9915c8f 100644
--- a/app/assets/javascripts/app/controllers/_channel/email.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/email.coffee
@@ -298,7 +298,7 @@ class ChannelEmailEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+ @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
)
class ChannelEmailAccountWizard extends App.ControllerWizardModal
@@ -605,7 +605,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
)
probeInboundMessagesFound: (data, verify) =>
- message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages)
+ message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', data.content_messages)
@$('.js-inbound-acknowledge .js-messageFound').html(message)
if !verify
diff --git a/app/assets/javascripts/app/controllers/_channel/facebook.coffee b/app/assets/javascripts/app/controllers/_channel/facebook.coffee
index 3a37ca88e..c387aa66b 100644
--- a/app/assets/javascripts/app/controllers/_channel/facebook.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/facebook.coffee
@@ -178,7 +178,7 @@ class AppConfig extends App.ControllerModal
@isChanged = true
@close()
fail: =>
- @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+ @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
)
return
@formEnable(e)
@@ -242,7 +242,7 @@ class AccountEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+ @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
)
App.Config.set('Facebook', { prio: 5100, name: __('Facebook'), parent: '#channels', target: '#channels/facebook', controller: ChannelFacebook, permission: ['admin.channel_facebook'] }, 'NavBarAdmin')
diff --git a/app/assets/javascripts/app/controllers/_channel/google.coffee b/app/assets/javascripts/app/controllers/_channel/google.coffee
index 58df767cc..bc4fca2dd 100644
--- a/app/assets/javascripts/app/controllers/_channel/google.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/google.coffee
@@ -323,7 +323,7 @@ class ChannelInboundEdit extends App.ControllerModal
details = xhr.responseJSON || {}
@notify
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save changes.'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The changes could not be saved.'))
timeout: 6000
)
@@ -375,7 +375,7 @@ class ChannelGroupEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+ @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
)
class AppConfig extends App.ControllerModal
@@ -421,7 +421,7 @@ class AppConfig extends App.ControllerModal
@isChanged = true
@close()
fail: =>
- @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+ @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
)
return
@formEnable(e)
diff --git a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
index 3bba931f0..4fda03822 100644
--- a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
@@ -314,7 +314,7 @@ class ChannelInboundEdit extends App.ControllerModal
details = xhr.responseJSON || {}
@notify
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save changes.'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The changes could not be saved.'))
timeout: 6000
)
@@ -366,7 +366,7 @@ class ChannelGroupEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+ @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
)
class AppConfig extends App.ControllerModal
@@ -412,7 +412,7 @@ class AppConfig extends App.ControllerModal
@isChanged = true
@close()
fail: =>
- @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+ @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
)
return
@formEnable(e)
diff --git a/app/assets/javascripts/app/controllers/_channel/sms.coffee b/app/assets/javascripts/app/controllers/_channel/sms.coffee
index 4577777a0..d4ca67f05 100644
--- a/app/assets/javascripts/app/controllers/_channel/sms.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/sms.coffee
@@ -262,7 +262,7 @@ class ChannelSmsAccount extends App.ControllerModal
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.showAlert(details.error_human || details.error || __('Unable to update object!'))
+ ui.showAlert(details.error_human || details.error || __('The object could not be updated.'))
)
onTest: (e) ->
@@ -376,7 +376,7 @@ class ChannelSmsNotification extends App.ControllerModal
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.showAlert(details.error_human || details.error || __('Unable to update object!'))
+ ui.showAlert(details.error_human || details.error || __('The object could not be updated.'))
)
onTest: (e) ->
diff --git a/app/assets/javascripts/app/controllers/_channel/telegram.coffee b/app/assets/javascripts/app/controllers/_channel/telegram.coffee
index b71ca7065..8617e925e 100644
--- a/app/assets/javascripts/app/controllers/_channel/telegram.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/telegram.coffee
@@ -197,7 +197,7 @@ class BotEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- error_message = App.i18n.translateContent(data.error || __('Unable to save changes.'))
+ error_message = App.i18n.translateContent(data.error || __('The changes could not be saved.'))
@el.find('.alert').removeClass('hidden').text(error_message)
)
diff --git a/app/assets/javascripts/app/controllers/_channel/twitter.coffee b/app/assets/javascripts/app/controllers/_channel/twitter.coffee
index 909cbc652..f568a922a 100644
--- a/app/assets/javascripts/app/controllers/_channel/twitter.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/twitter.coffee
@@ -185,7 +185,7 @@ class AppConfig extends App.ControllerModal
@isChanged = true
@close()
fail: =>
- @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+ @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
)
return
@formEnable(e)
@@ -296,7 +296,7 @@ class AccountEdit extends App.ControllerModal
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
- @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+ @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
)
App.Config.set('Twitter', { prio: 5000, name: __('Twitter'), parent: '#channels', target: '#channels/twitter', controller: ChannelTwitter, permission: ['admin.channel_twitter'] }, 'NavBarAdmin')
diff --git a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
index 20d52d3dc..39d250abe 100644
--- a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
@@ -3,7 +3,7 @@ class CheckMk extends App.ControllerIntegrationBase
featureName: __('Checkmk')
featureConfig: 'check_mk_config'
description: [
- [__('This service receives http requests or emails from %s and creates tickets with host and service.'), 'Checkmk']
+ [__('This service receives HTTP requests or emails from %s and creates tickets with host and service.'), 'Checkmk']
[__('If the host and service have recovered, the ticket can be closed automatically.')]
]
diff --git a/app/assets/javascripts/app/controllers/_integration/clearbit.coffee b/app/assets/javascripts/app/controllers/_integration/clearbit.coffee
index ff40851f8..67e844975 100644
--- a/app/assets/javascripts/app/controllers/_integration/clearbit.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/clearbit.coffee
@@ -61,7 +61,7 @@ class Form extends App.Controller
if !@config
@config = @currentConfig()
settings = [
- { name: 'api_key', display: __('API Key'), tag: 'input', type: 'text', limit: 100, null: false, placeholder: '...', note: __('Your api key.') },
+ { name: 'api_key', display: __('API Key'), tag: 'input', type: 'text', limit: 100, null: false, placeholder: '...', note: __('Your API key.') },
{ name: 'organization_autocreate', display: __('Auto create'), tag: 'boolean', type: 'boolean', null: false, note: __('Create organizations automatically if record has one.') },
{ name: 'organization_shared', display: __('Shared'), tag: 'boolean', type: 'boolean', null: false, note: __('New organizations are shared.') },
]
diff --git a/app/assets/javascripts/app/controllers/_integration/ldap.coffee b/app/assets/javascripts/app/controllers/_integration/ldap.coffee
index fdb4680e7..a791b15d2 100644
--- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee
@@ -345,12 +345,12 @@ class ConnectionWizard extends App.ControllerWizardModal
if _.isEmpty(data.user_attributes)
@showSlide('js-bind')
- @showAlert('js-bind', __('Unable to retrive user information, please check your bind user permissions.'))
+ @showAlert('js-bind', __('User information could not be retrieved, please check your bind user permissions.'))
return
if _.isEmpty(data.groups)
@showSlide('js-bind')
- @showAlert('js-bind', __('Unable to retrive group information, please check your bind user permissions.'))
+ @showAlert('js-bind', __('Group information could not be retrieved, please check your bind user permissions.'))
return
# update config if successful
diff --git a/app/assets/javascripts/app/controllers/_integration/slack.coffee b/app/assets/javascripts/app/controllers/_integration/slack.coffee
index dc69e8432..d855c4ffa 100644
--- a/app/assets/javascripts/app/controllers/_integration/slack.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/slack.coffee
@@ -4,7 +4,7 @@ class Slack extends App.ControllerIntegrationBase
featureConfig: 'slack_config'
description: [
[__('This service sends notifications to your %s channel.'), 'Slack']
- [__('To set up this service you need to create a new |"Incoming webhook"| in your %s integration panel, and enter the web hook URL below.'), 'Slack']
+ [__('To set up this service you need to create a new |"Incoming webhook"| in your %s integration panel and enter the webhook URL below.'), 'Slack']
]
events:
'click .js-submit': 'update'
diff --git a/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee b/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee
index da8727f9d..6a8f4bc0c 100644
--- a/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee
+++ b/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee
@@ -64,7 +64,7 @@ class Modal extends App.ControllerModal
@update()
error: =>
- @contentInline = App.i18n.translateContent('Unable to send verify email.')
+ @contentInline = App.i18n.translateContent('Verification email could not be sent.')
@update()
App.Config.set('user_signup', UserSignupCheck, 'Plugins')
diff --git a/app/assets/javascripts/app/controllers/_settings/area_switch.coffee b/app/assets/javascripts/app/controllers/_settings/area_switch.coffee
index 027b336be..710fc2112 100644
--- a/app/assets/javascripts/app/controllers/_settings/area_switch.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/area_switch.coffee
@@ -90,7 +90,7 @@ class App.SettingsAreaSwitch extends App.Controller
ui.formEnable(e)
App.Event.trigger 'notify', {
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to update object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be updated.'))
timeout: 2000
}
)
diff --git a/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee b/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee
index 196fa1ea0..d0f6b808b 100644
--- a/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee
@@ -126,7 +126,7 @@ class App.SettingsAreaTicketNumber extends App.Controller
ui.formEnable(e)
App.Event.trigger 'notify', {
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to update object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be updated.'))
timeout: 2000
}
)
diff --git a/app/assets/javascripts/app/controllers/_settings/form.coffee b/app/assets/javascripts/app/controllers/_settings/form.coffee
index 166fbb73c..32a2b72c2 100644
--- a/app/assets/javascripts/app/controllers/_settings/form.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/form.coffee
@@ -88,7 +88,7 @@ class App.SettingsForm extends App.Controller
fail: (settings, details) ->
App.Event.trigger('notify', {
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to update object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be updated.'))
timeout: 2000
})
)
diff --git a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
index 237f5f064..25d02e1c2 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
@@ -473,7 +473,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
params: params
)
configureAttributes = [
- { name: 'data_option::url', display: __('Url (AJAX Endpoint)'), tag: 'input', type: 'url', null: false, default: '', placeholder: 'https://example.com/serials' },
+ { name: 'data_option::url', display: __('URL (AJAX endpoint)'), tag: 'input', type: 'url', null: false, default: '', placeholder: 'https://example.com/serials' },
]
autocompletionUrl = new App.ControllerForm(
model:
@@ -482,7 +482,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
params: params
)
configureAttributes = [
- { name: 'data_option::method', display: __('Method (AJAX Endpoint)'), tag: 'input', type: 'url', null: false, default: '', placeholder: __('GET') },
+ { name: 'data_option::method', display: __('Method (AJAX endpoint)'), tag: 'input', type: 'url', null: false, default: '', placeholder: __('GET') },
]
autocompletionMethod = new App.ControllerForm(
model:
diff --git a/app/assets/javascripts/app/controllers/_ui_element/richtext_additions/embed_video_button.coffee b/app/assets/javascripts/app/controllers/_ui_element/richtext_additions/embed_video_button.coffee
index 572816d2b..4731b4295 100644
--- a/app/assets/javascripts/app/controllers/_ui_element/richtext_additions/embed_video_button.coffee
+++ b/app/assets/javascripts/app/controllers/_ui_element/richtext_additions/embed_video_button.coffee
@@ -10,7 +10,7 @@ class App.UiElement.richtext.toolButtons.embed_video extends App.UiElement.richt
name: 'link'
display: __('Link')
tag: 'input'
- placeholder: __('Youtube or Vimeo address')
+ placeholder: __('YouTube or Vimeo address')
}
]
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
index d064c9479..ab954efdb 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
@@ -579,7 +579,7 @@ class App.TicketCreate extends App.Controller
if !@hasAttachments()
matchingWord = App.Utils.checkAttachmentReference(article['body'])
if matchingWord
- if !confirm(App.i18n.translateContent('You use %s in text but no attachment is attached. Do you want to continue?', matchingWord))
+ if !confirm(App.i18n.translateContent('You used %s in the text but no attachment could be found. Do you want to continue?', matchingWord))
return
# add sidebar params
@@ -626,7 +626,7 @@ class App.TicketCreate extends App.Controller
ui.submitEnable(e)
ui.notify(
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to create object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be created.'))
timeout: 6000
)
)
diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee
index e9887fc77..b334215ab 100644
--- a/app/assets/javascripts/app/controllers/chat.coffee
+++ b/app/assets/javascripts/app/controllers/chat.coffee
@@ -195,7 +195,7 @@ class App.CustomerChat extends App.Controller
# if we have more chats, let decide the user
else
- msg = __('To be able to chat you need to select min. one chat topic below!')
+ msg = __('To be able to chat you need to select at least one chat topic from below!')
# open modal settings
@settings(
diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
index 4266d6411..502325583 100644
--- a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
+++ b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
@@ -18,7 +18,7 @@ class CustomerTicketCreate extends App.ControllerAppContent
render: (template = {}) ->
if !@Config.get('customer_ticket_create')
@renderScreenError(
- detail: __('Your role cannot create new ticket. Please contact your administrator.')
+ detail: __('Your user role is not allowed to create new tickets. Please contact your administrator.')
objectName: 'Ticket'
)
return
@@ -186,7 +186,7 @@ class CustomerTicketCreate extends App.ControllerAppContent
ui.submitEnable(e)
ui.notify(
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to create object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be created.'))
timeout: 6000
)
)
diff --git a/app/assets/javascripts/app/controllers/data_privacy.coffee b/app/assets/javascripts/app/controllers/data_privacy.coffee
index ea2c514df..14fd20966 100644
--- a/app/assets/javascripts/app/controllers/data_privacy.coffee
+++ b/app/assets/javascripts/app/controllers/data_privacy.coffee
@@ -261,7 +261,7 @@ class TaskNew extends App.ControllerGenericNew
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to create object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be created.'))
)
App.Config.set('DataPrivacy', { prio: 3600, name: __('Data Privacy'), parent: '#system', target: '#system/data_privacy', controller: Index, permission: ['admin.data_privacy'] }, 'NavBarAdmin')
diff --git a/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee b/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
index 4ba51a1e1..a0cec41d6 100644
--- a/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
@@ -238,7 +238,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
)
probeInboundMessagesFound: (data, verify) =>
- message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages)
+ message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', data.content_messages)
@$('.js-inbound-acknowledge .js-messageFound').html(message)
if !verify
diff --git a/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_dialog.coffee b/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_dialog.coffee
index 58b379eb7..8e42535f7 100644
--- a/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_dialog.coffee
+++ b/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_dialog.coffee
@@ -33,7 +33,7 @@ class App.KnowledgeBaseContentCanBePublishedDialog extends App.ControllerModal
@formController.toggleDisabled(false)
error: (xhr) =>
@formController.toggleDisabled(false)
- @showAlert(xhr.responseJSON?.error || __('Unable to save changes'))
+ @showAlert(xhr.responseJSON?.error || __('The changes could not be saved.'))
)
clickedCancelTimer: (e) ->
diff --git a/app/assets/javascripts/app/controllers/knowledge_base/editor_coordinator.coffee b/app/assets/javascripts/app/controllers/knowledge_base/editor_coordinator.coffee
index b4988e328..4e8f6309e 100644
--- a/app/assets/javascripts/app/controllers/knowledge_base/editor_coordinator.coffee
+++ b/app/assets/javascripts/app/controllers/knowledge_base/editor_coordinator.coffee
@@ -40,5 +40,5 @@ class App.KnowledgeBaseEditorCoordinator
error: (xhr) ->
data = JSON.parse(xhr.responseText)
App.ControllerForm.enable(formController.form)
- formController.showAlert(data.error || __('Unable to save changes.'))
+ formController.showAlert(data.error || __('The changes could not be saved.'))
)
diff --git a/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee b/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee
index 2195e4ed1..af0de3f3d 100644
--- a/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee
+++ b/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee
@@ -132,4 +132,4 @@ class DeleteConfirm extends App.ControllerConfirm
error: (xhr) =>
@formEnable(@el)
- @showAlert(xhr.responseJSON?.error || __('Unable to save changes'))
+ @showAlert(xhr.responseJSON?.error || __('The changes could not be saved.'))
diff --git a/app/assets/javascripts/app/controllers/object_manager.coffee b/app/assets/javascripts/app/controllers/object_manager.coffee
index fa83ea7fd..a6a8603f6 100644
--- a/app/assets/javascripts/app/controllers/object_manager.coffee
+++ b/app/assets/javascripts/app/controllers/object_manager.coffee
@@ -230,7 +230,7 @@ class New extends App.ControllerGenericNew
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to create object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be created.'))
)
class Edit extends App.ControllerGenericEdit
@@ -294,7 +294,7 @@ class Edit extends App.ControllerGenericEdit
fail: (settings, details) ->
ui.log 'errors'
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to update object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be updated.'))
)
App.Config.set('SystemObject', { prio: 1700, parent: '#system', name: __('Objects'), target: '#system/object_manager', controller: ObjectManager, permission: ['admin.object'] }, 'NavBarAdmin')
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
index d461034c7..2931b1dfd 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
@@ -311,7 +311,7 @@ class App.TicketZoomArticleNew extends App.Controller
if params.body && attachmentCount < 1
matchingWord = App.Utils.checkAttachmentReference(params.body)
if matchingWord
- if !confirm(App.i18n.translateContent('You use %s in text but no attachment is attached. Do you want to continue?', matchingWord))
+ if !confirm(App.i18n.translateContent('You used %s in the text but no attachment could be found. Do you want to continue?', matchingWord))
return false
# backend based validation
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
index 7e1ac3669..67f21134f 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
@@ -317,7 +317,7 @@ class ArticleViewItem extends App.ControllerObserver
type: 'success'
msg: App.i18n.translateContent('The signature was successfully verified.')
else if data.sign.comment
- comment = App.i18n.translateContent('Verify sign failed!') + ' ' + App.i18n.translateContent(data.sign.comment || '')
+ comment = App.i18n.translateContent('Signature verification failed!') + ' ' + App.i18n.translateContent(data.sign.comment || '')
@notify
type: 'error'
msg: comment
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
index ed932f0d9..99a1bdc5a 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
@@ -133,7 +133,7 @@ class SidebarIdoit extends App.Controller
@log 'errors', details
@notify(
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to update object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be updated.'))
timeout: 6000
)
)
diff --git a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee
index cd06914d4..0bac78389 100644
--- a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee
+++ b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee
@@ -89,5 +89,5 @@ class UserNew extends App.ControllerModal
fail: (settings, details) ->
ui.log 'errors', details
ui.formEnable(e)
- ui.controller.showAlert(details.error_human || details.error || __('Unable to create object!'))
+ ui.controller.showAlert(details.error_human || details.error || __('The object could not be created.'))
)
diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee
index b259b6d76..7da973bd5 100644
--- a/app/assets/javascripts/app/models/organization.coffee
+++ b/app/assets/javascripts/app/models/organization.coffee
@@ -17,10 +17,10 @@ class App.Organization extends App.Model
]
@description = __('''
-Using **Organisations** you can **group** customers. This has among others two important benefits:
+Using **organizations** you can **group** customers. This has two main benefits:
-1. As an **Agent** you do not only have an overview of the open tickets for one person but an **overview over their whole organisation**.
-2. As a **Customer** you can also check the **Tickets which your colleagues created** and modify their tickets (if your organization is set to "shared", which can be defined per organization).
+1. As an **agent** you don't just have an overview of the open tickets for one person but an **overview over their whole organization**.
+2. As a **customer** you can also check the **tickets which your colleagues created** and modify their tickets (if your organization is set to "shared", which can be defined per organization).
''')
uiUrl: ->
diff --git a/app/assets/javascripts/app/models/overview.coffee b/app/assets/javascripts/app/models/overview.coffee
index a6d48a35b..cd72f7325 100644
--- a/app/assets/javascripts/app/models/overview.coffee
+++ b/app/assets/javascripts/app/models/overview.coffee
@@ -79,7 +79,7 @@ class App.Overview extends App.Model
]
@description = __('''
-You can create **overviews** for your agents and your customers. These could for instance serve as a sort of work list for items for which your agents would work.
+You can create **overviews** for your agents and your customers. These have many purposes, such as serving as a to-do list for your agents.
You can also create overviews and limit them to specific agents or to groups of agents.
''')
diff --git a/app/assets/javascripts/app/models/setting.coffee b/app/assets/javascripts/app/models/setting.coffee
index d35f78b0e..e521741dc 100644
--- a/app/assets/javascripts/app/models/setting.coffee
+++ b/app/assets/javascripts/app/models/setting.coffee
@@ -28,7 +28,7 @@ class App.Setting extends App.Model
options.fail = (settings, details) ->
App.Event.trigger 'notify', {
type: 'error'
- msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to update object!'))
+ msg: App.i18n.translateContent(details.error_human || details.error || __('The object could not be updated.'))
timeout: 2000
}
if options.failLocal
diff --git a/app/assets/javascripts/app/models/ticket.coffee b/app/assets/javascripts/app/models/ticket.coffee
index c2e8d5f8c..fb5a43cb7 100644
--- a/app/assets/javascripts/app/models/ticket.coffee
+++ b/app/assets/javascripts/app/models/ticket.coffee
@@ -111,7 +111,7 @@ class App.Ticket extends App.Model
when 'reminder_reached'
App.i18n.translateContent('Pending reminder reached for ticket |%s|', item.title)
when 'escalation'
- App.i18n.translateContent('Ticket |%s| is escalated!', item.title)
+ App.i18n.translateContent('Ticket |%s| has escalated!', item.title)
when 'escalation_warning'
App.i18n.translateContent('Ticket |%s| will escalate soon!', item.title)
when 'update.merged_into'
diff --git a/app/assets/javascripts/app/models/webhook.coffee b/app/assets/javascripts/app/models/webhook.coffee
index 5eba8cf91..42737f5d5 100644
--- a/app/assets/javascripts/app/models/webhook.coffee
+++ b/app/assets/javascripts/app/models/webhook.coffee
@@ -19,9 +19,9 @@ class App.Webhook extends App.Model
]
@description = __('''
-Webhooks make it easy to send information about events within Zammad to third party systems via HTTP(S).
+Webhooks make it easy to send information about events within Zammad to third-party systems via HTTP(S).
-You can use Webhooks in Zammad to send Ticket, Article and Attachment data whenever a Trigger is performed. Just create and configure your Webhook with an HTTP(S) endpoint and relevant security settings, configure a Trigger to perform it.
+You can use webhooks in Zammad to send ticket, article, and attachment data whenever a trigger is performed. Just create and configure your webhook with an HTTP(S) endpoint and relevant security settings, then configure a trigger to perform it.
''')
displayName: ->
diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco
index 73b05e197..43f1f215d 100644
--- a/app/assets/javascripts/app/views/channel/chat.jst.eco
+++ b/app/assets/javascripts/app/views/channel/chat.jst.eco
@@ -138,7 +138,7 @@
<%- marked(@T('Insert the widget code into the source code of every page the chat shall be visible on. It should be placed at the end of the page\'s source code before the §
§ closing tag.')) %>