diff --git a/app/assets/javascripts/app/controllers/_application_controller/generic_destroy_confirm.coffee b/app/assets/javascripts/app/controllers/_application_controller/generic_destroy_confirm.coffee
index 35f34c211..b0ef1d2ca 100644
--- a/app/assets/javascripts/app/controllers/_application_controller/generic_destroy_confirm.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller/generic_destroy_confirm.coffee
@@ -7,7 +7,7 @@ class App.ControllerGenericDestroyConfirm extends App.ControllerModal
small: true
content: ->
- App.i18n.translateContent('Sure to delete this object?')
+ App.i18n.translateContent('Do you really want to delete this object?')
onSubmit: =>
options = @options || {}
diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee
index a62fe8497..5c38a54d5 100644
--- a/app/assets/javascripts/app/controllers/_channel/chat.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee
@@ -87,7 +87,7 @@ class ChannelChat extends App.ControllerSubContent
name: 'inactiveClass'
default: "'is-inactive'"
type: 'String'
- description: __('This class gets added to the button on initialization and gets removed once the chat connection got established.')
+ description: __('This class gets added to the button on initialization and will be removed once the chat connection is established.')
}
{
name: 'cssAutoload'
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 6a88fb2e6..da8727f9d 100644
--- a/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee
+++ b/app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee
@@ -42,7 +42,7 @@ class Modal extends App.ControllerModal
content: =>
if !@sent
- return App.i18n.translateContent('Your account has not been verified. Please click the link in the verification email.')
+ return App.i18n.translateContent('Your account has not been verified. Please click on the link in the verification email.')
content = App.i18n.translateContent('We\'ve sent an email to _%s_. Click the link in the email to verify your account.', @user.email)
content += '
'
content += App.i18n.translateContent('If you don\'t see the email, check other places it might be, like your junk, spam, social, or other folders.')
diff --git a/app/assets/javascripts/app/controllers/getting_started/admin.coffee b/app/assets/javascripts/app/controllers/getting_started/admin.coffee
index 219116af4..099b834c4 100644
--- a/app/assets/javascripts/app/controllers/getting_started/admin.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started/admin.coffee
@@ -93,7 +93,7 @@ class GettingStartedAdmin extends App.ControllerWizardFullScreen
error: ->
App.Event.trigger('notify', {
type: 'error'
- msg: App.i18n.translateContent('Signin failed! Please contact the support team!')
+ msg: App.i18n.translateContent('The sign-in failed. Please contact the Support team.')
timeout: 2500
})
)
diff --git a/app/assets/javascripts/app/controllers/job.coffee b/app/assets/javascripts/app/controllers/job.coffee
index d35ea8f08..1cf17442f 100644
--- a/app/assets/javascripts/app/controllers/job.coffee
+++ b/app/assets/javascripts/app/controllers/job.coffee
@@ -19,7 +19,7 @@ class Job extends App.ControllerSubContent
pagerPerPage: 150
navupdate: '#Jobs'
notes: [
- __('Scheduler are …')
+ __('Schedulers are …')
]
buttons: [
{ name: __('New Scheduler'), 'data-type': 'new', class: 'btn--success' }
diff --git a/app/assets/javascripts/app/controllers/organization.coffee b/app/assets/javascripts/app/controllers/organization.coffee
index f8d151b79..51fa9d34b 100644
--- a/app/assets/javascripts/app/controllers/organization.coffee
+++ b/app/assets/javascripts/app/controllers/organization.coffee
@@ -24,7 +24,7 @@ class Organization extends App.ControllerSubContent
pagerPerPage: 150
navupdate: '#organizations'
notes: [
- __('Organizations are for any person in the system. Agents (Owners, Resposbiles, …) and Customers.')
+ __('Organizations are for any person in the system: agents (owners, responsibles, …) and customers.')
]
buttons: [
{ name: __('Import'), 'data-type': 'import', class: 'btn' }
diff --git a/app/assets/javascripts/app/controllers/overview.coffee b/app/assets/javascripts/app/controllers/overview.coffee
index ec3e3f07d..c2f42675e 100644
--- a/app/assets/javascripts/app/controllers/overview.coffee
+++ b/app/assets/javascripts/app/controllers/overview.coffee
@@ -21,7 +21,7 @@ class Overview extends App.ControllerSubContent
objects: __('Overviews')
navupdate: '#overviews'
notes: [
- __('Overview are …')
+ __('Overviews are …')
]
buttons: [
{ name: __('New Overview'), 'data-type': 'new', class: 'btn--success' }
diff --git a/app/assets/javascripts/app/controllers/sla.coffee b/app/assets/javascripts/app/controllers/sla.coffee
index 1d03e8910..5c457b758 100644
--- a/app/assets/javascripts/app/controllers/sla.coffee
+++ b/app/assets/javascripts/app/controllers/sla.coffee
@@ -69,7 +69,7 @@ class Sla extends App.ControllerSubContent
id: id
pageData:
title: __('SLAs')
- object: __('Sla')
+ object: __('SLA')
objects: __('SLAs')
genericObject: 'Sla'
callback: @load
diff --git a/app/assets/javascripts/app/controllers/tag.coffee b/app/assets/javascripts/app/controllers/tag.coffee
index b4f849e69..d807481b2 100644
--- a/app/assets/javascripts/app/controllers/tag.coffee
+++ b/app/assets/javascripts/app/controllers/tag.coffee
@@ -136,7 +136,7 @@ class DestroyConfirm extends App.ControllerModal
small: true
content: ->
- App.i18n.translateContent('Sure to delete this object?')
+ App.i18n.translateContent('Do you really want to delete this object?')
onSubmit: =>
@ajax(
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 327ae5b49..7e1ac3669 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
@@ -315,7 +315,7 @@ class ArticleViewItem extends App.ControllerObserver
if data.sign.success
@notify
type: 'success'
- msg: App.i18n.translateContent('Verify sign 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 || '')
@notify
@@ -326,7 +326,7 @@ class ArticleViewItem extends App.ControllerObserver
if data.encryption.success
@notify
type: 'success'
- msg: App.i18n.translateContent('Decryption successful!')
+ msg: App.i18n.translateContent('Decryption was successful.')
else if data.encryption.comment
comment = App.i18n.translateContent('Decryption failed!') + ' ' + App.i18n.translateContent(data.encryption.comment || '')
@notify
@@ -337,7 +337,7 @@ class ArticleViewItem extends App.ControllerObserver
error: (xhr) =>
@notify
type: 'error'
- msg: App.i18n.translateContent('Retry security process failed!')
+ msg: App.i18n.translateContent('The retried security process failed!')
)
stopPropagation: (e) ->
diff --git a/app/assets/javascripts/app/controllers/translation.coffee b/app/assets/javascripts/app/controllers/translation.coffee
index ed7742332..6fbb18e67 100644
--- a/app/assets/javascripts/app/controllers/translation.coffee
+++ b/app/assets/javascripts/app/controllers/translation.coffee
@@ -110,7 +110,7 @@ class Translation extends App.ControllerSubContent
resetChanges: =>
@loader = new App.ControllerModalLoading(
head: __('Reset changes')
- message: __('Reseting changes…')
+ message: __('Resetting changes…')
container: @el.closest('.content')
)
@ajax(
diff --git a/app/assets/javascripts/app/controllers/user.coffee b/app/assets/javascripts/app/controllers/user.coffee
index d60b1573c..abb83b9f3 100644
--- a/app/assets/javascripts/app/controllers/user.coffee
+++ b/app/assets/javascripts/app/controllers/user.coffee
@@ -102,7 +102,7 @@ class User extends App.ControllerSubContent
attribute.title = null
if object.maxLoginFailedReached()
- attribute.title = App.i18n.translateContent('The user is locked, because of too many failed login attempts.')
+ attribute.title = App.i18n.translateContent('This user is currently blocked because of too many failed login attempts.')
attribute.prefixIcon = 'lock'
value
diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js
index cc8139e17..45fcd955a 100644
--- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js
+++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js
@@ -742,7 +742,7 @@
}
else {
textmodule.emptyResultsContainer()
- items.push($('
').text(App.i18n.translateInline('Please select a group first, before you mention a user!')))
+ items.push($('
').text(App.i18n.translateInline('Before you mention a user, please select a group.')))
textmodule.appendResults(items)
}
}, 200, 'textmoduleMentionDelay', 'textmodule')
diff --git a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
index 31718fc95..ab1fa07ff 100644
--- a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
@@ -5,6 +5,6 @@
- <%- @T('There can be several reasons for the chat to not show up:') %>
+ <%- @T("There are several possible reasons why the chat won't show up:") %>
<%- @T('The browser is outdated. It does not support WebSocket - the technology we use for the chat.') %>
<%- @T('There is no agent online.') %>
<%- @T('The chat is turned off.') %>
-
<%- @T('There are too many people in queue for the chat.') %>
+
<%- @T('There are too many people in the chat queue.') %>
<%- @T('When you turn on debugging by setting the option §debug§ to §true§ the reason gets printed to the javascript console.') %>
diff --git a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
index 17aa5bfbe..358eca5d4 100644
--- a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
+++ b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
@@ -9,7 +9,7 @@
<% if @is_allowed_to_create_ticket: %>
<%- @T('You have not created a ticket yet.') %>
<%- @T('The way to communicate with us is this thing called "ticket".') %>
-
<%- @T('Please click the button below to create your first one.') %>
+
<%- @T('Please click on the button below to create your first one.') %>
<%- @T('There is no rollback of this deletion possible. If you are absolutely sure to do this, then type in "%s" into the input.', App.i18n.translatePlain('delete').toUpperCase()) %>
+
<%- @T('There is no rollback of this deletion possible. If you are sure that you wish to proceed, please type "%s" into the input.', App.i18n.translatePlain('delete').toUpperCase()) %>
- <%- @T('The tutorial on how to manage a %s is hosted on our online documentation %l.', 'Facebook App', 'https://admin-docs.zammad.org/en/latest/channels/facebook.html') %>
+ <%- @T('You can find a tutorial on how to manage a %s in our online documentation %l.', 'Facebook App', 'https://admin-docs.zammad.org/en/latest/channels/facebook.html') %>