diff --git a/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee b/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee index 5955bf999..0a1fd32b4 100644 --- a/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee +++ b/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee @@ -473,7 +473,7 @@ App.Config.set( { key: 'y' hotkeys: true - description: __('...of whole textarea') + description: __('...of whole text area') globalEvent: 'richtext-remove-formating-textarea' } { diff --git a/app/assets/javascripts/app/models/calendar.coffee b/app/assets/javascripts/app/models/calendar.coffee index bce4ebddf..c2b497c3e 100644 --- a/app/assets/javascripts/app/models/calendar.coffee +++ b/app/assets/javascripts/app/models/calendar.coffee @@ -20,9 +20,9 @@ class App.Calendar extends App.Model "#{@name} - #{@timezone}" @description = __(''' -A **calendar** is needed for calculation of escalation based on business hours and sending out escalation notifications.. +A **calendar** is needed to calculate escalations based on business hours and to send out escalation notifications. -Define a **"standard"** calendar which is valid system-wide. Only in the defined business hours the escalation notifications will be sent to your agents. +Define a **"standard"** calendar which is valid system-wide. The escalation notifications will only be sent to your agents during the defined business hours. -Do you have customers with different business hours, you can create multiple calendars. Tickets are linked to calendars using **SLAs**. +If you have customers with different business hours, you can create multiple calendars. Tickets are linked to calendars using **SLAs**. ''') diff --git a/app/assets/javascripts/app/models/data_privacy_task.coffee b/app/assets/javascripts/app/models/data_privacy_task.coffee index d8a30971b..de2861311 100644 --- a/app/assets/javascripts/app/models/data_privacy_task.coffee +++ b/app/assets/javascripts/app/models/data_privacy_task.coffee @@ -13,11 +13,11 @@ class App.DataPrivacyTask extends App.Model @configure_overview = [] @description = __(''' -** Data Privacy **, helps you to delete and verify the removal of existing data of the system. +** Data Privacy ** helps you to delete and verify the removal of existing data from the system. -It can be used to delete tickets, organizations and users. The owner assignment will be unset in case the deleted user is an agent. +It can be used to delete tickets, organizations, and users. The owner assignment will be unset in case the deleted user is an agent. -Data Privacy tasks will be executed every 10 minutes. The execution might take some additional time depending of the number of objects that should get deleted. +Data Privacy tasks will be executed every 10 minutes. The execution might take some additional time depending on the number of objects that will be deleted. ''') activityMessage: (item) -> @@ -25,9 +25,9 @@ Data Privacy tasks will be executed every 10 minutes. The execution might take s return if !item.created_by if item.type is 'create' - return App.i18n.translateContent('%s created data privacy task to delete user id |%s|', item.created_by.displayName(), item.objectNative.deletable_id) + return App.i18n.translateContent('%s created data privacy task to delete user ID |%s|', item.created_by.displayName(), item.objectNative.deletable_id) else if item.type is 'update' - return App.i18n.translateContent('%s updated data privacy task to delete user id |%s|', item.created_by.displayName(), item.objectNative.deletable_id) + return App.i18n.translateContent('%s updated data privacy task to delete user ID |%s|', item.created_by.displayName(), item.objectNative.deletable_id) else if item.type is 'completed' - return App.i18n.translateContent('%s completed data privacy task to delete user id |%s|', item.created_by.displayName(), item.objectNative.deletable_id) + return App.i18n.translateContent('%s completed data privacy task to delete user ID |%s|', item.created_by.displayName(), item.objectNative.deletable_id) return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." diff --git a/app/assets/javascripts/app/models/group.coffee b/app/assets/javascripts/app/models/group.coffee index c59cd3361..f6caf70f4 100644 --- a/app/assets/javascripts/app/models/group.coffee +++ b/app/assets/javascripts/app/models/group.coffee @@ -24,9 +24,9 @@ class App.Group extends App.Model activityMessage: (item) -> if item.type is 'create' - return App.i18n.translateContent('%s created Group |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s created group |%s|', item.created_by.displayName(), item.title) else if item.type is 'update' - return App.i18n.translateContent('%s updated Group |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s updated group |%s|', item.created_by.displayName(), item.title) return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." avatar: (size = 40, cssClass = []) -> diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee index 0c3a5182d..2aeea52ed 100644 --- a/app/assets/javascripts/app/models/organization.coffee +++ b/app/assets/javascripts/app/models/organization.coffee @@ -79,7 +79,7 @@ Using **Organisations** you can **group** customers. This has among others two i return if !item.created_by if item.type is 'create' - return App.i18n.translateContent('%s created Organization |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s created organization |%s|', item.created_by.displayName(), item.title) else if item.type is 'update' - return App.i18n.translateContent('%s updated Organization |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s updated organization |%s|', item.created_by.displayName(), item.title) return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." diff --git a/app/assets/javascripts/app/models/role.coffee b/app/assets/javascripts/app/models/role.coffee index b6b886411..9bd10b99d 100644 --- a/app/assets/javascripts/app/models/role.coffee +++ b/app/assets/javascripts/app/models/role.coffee @@ -23,9 +23,9 @@ class App.Role extends App.Model return if !item.created_by if item.type is 'create' - return App.i18n.translateContent('%s created Role |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s created role |%s|', item.created_by.displayName(), item.title) else if item.type is 'update' - return App.i18n.translateContent('%s updated Role |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s updated role |%s|', item.created_by.displayName(), item.title) return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." @_fillUp: (data) -> diff --git a/app/assets/javascripts/app/models/sla.coffee b/app/assets/javascripts/app/models/sla.coffee index dc3db3cf5..84767e118 100644 --- a/app/assets/javascripts/app/models/sla.coffee +++ b/app/assets/javascripts/app/models/sla.coffee @@ -22,9 +22,9 @@ class App.Sla extends App.Model ] @description = __(''' -** Service Level Agreements **, abbreviated ** SLAs **, help you to meet certain customers' time-related responses. Thus, for example, you can say customers should always get a response from you after 8 hours at the latest. In the event of an imminent violation or a breach, Zammad will alert you to such events. +** Service Level Agreements **, abbreviated ** SLAs **, help you to meet specific response times for your customers' requests. This way you can define goals such as answering every inquiry within eight hours. If you are at risk of missing this target, Zammad will alert you. -It can be ** response time ** (time between the creation of a ticket and the first reaction of an agent), ** update time ** (time between a customer's request and an agent's reaction) and ** solution time ** (time between creation and closing a ticket ) To be defined. +You can define targets for three different metrics: ** response time ** (time between the creation of a ticket and the first reaction of an agent), ** update time ** (time between a customer's request and an agent's reaction), and ** solution time ** (time between creating and closing a ticket). -Any violations are displayed in a separate view in the overviews. You can also configure ** e-mail notifications **. +Any escalated tickets (i.e. tickets that have missed the defined target) are displayed in a separate view in your overviews. You can also configure ** email notifications **. ''') diff --git a/app/assets/javascripts/app/models/ticket.coffee b/app/assets/javascripts/app/models/ticket.coffee index 6e930949c..c2e8d5f8c 100644 --- a/app/assets/javascripts/app/models/ticket.coffee +++ b/app/assets/javascripts/app/models/ticket.coffee @@ -105,11 +105,11 @@ class App.Ticket extends App.Model switch item.type when 'create' - App.i18n.translateContent('%s created Ticket |%s|', item.created_by.displayName(), item.title) + App.i18n.translateContent('%s created ticket |%s|', item.created_by.displayName(), item.title) when 'update' - App.i18n.translateContent('%s updated Ticket |%s|', item.created_by.displayName(), item.title) + App.i18n.translateContent('%s updated ticket |%s|', item.created_by.displayName(), item.title) when 'reminder_reached' - App.i18n.translateContent('Pending reminder reached for Ticket |%s|', item.title) + App.i18n.translateContent('Pending reminder reached for ticket |%s|', item.title) when 'escalation' App.i18n.translateContent('Ticket |%s| is escalated!', item.title) when 'escalation_warning' diff --git a/app/assets/javascripts/app/models/ticket_article.coffee b/app/assets/javascripts/app/models/ticket_article.coffee index ba86baacb..2e9920b13 100644 --- a/app/assets/javascripts/app/models/ticket_article.coffee +++ b/app/assets/javascripts/app/models/ticket_article.coffee @@ -46,9 +46,9 @@ class App.TicketArticle extends App.Model return if !item.created_by if item.type is 'create' - return App.i18n.translateContent('%s created Article for |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s created article for |%s|', item.created_by.displayName(), item.title) else if item.type is 'update' - return App.i18n.translateContent('%s updated Article for |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s updated article for |%s|', item.created_by.displayName(), item.title) return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." @contentAttachments: (article) -> diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index e453116b7..484b5435f 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -177,9 +177,9 @@ class App.User extends App.Model return if !item.created_by if item.type is 'create' - return App.i18n.translateContent('%s created User |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s created user |%s|', item.created_by.displayName(), item.title) else if item.type is 'update' - return App.i18n.translateContent('%s updated User |%s|', item.created_by.displayName(), item.title) + return App.i18n.translateContent('%s updated user |%s|', item.created_by.displayName(), item.title) else if item.type is 'session started' return App.i18n.translateContent('%s started a new session', item.created_by.displayName()) else if item.type is 'switch to' diff --git a/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco b/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco index 1265e6ae1..d220b1a79 100644 --- a/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco +++ b/app/assets/javascripts/app/views/channel/email_account_overview.jst.eco @@ -50,9 +50,9 @@ <% date_migration = new Date("#{date_migration_string}T00:00:00") %> <% date_now = new Date() %> <% if date_now > date_migration: %> - <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported since %s.', 'G Suite', date_migration_string_local) %>
+ <%- @T('%s will only allow access via OAuth. Password-based access has not been supported since %s.', 'G Suite', date_migration_string_local) %>
<% else: %> - <%- @T('%s will only allow access via OAuth. Password-based access will no longer be supported on %s.', 'G Suite', date_migration_string_local) %>
+ <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported on %s.', 'G Suite', date_migration_string_local) %>
<% end %> <% end %> @@ -63,9 +63,9 @@ <% date_migration = new Date("#{date_migration_string}T00:00:00") %> <% date_now = new Date() %> <% if date_now > date_migration: %> - <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported since %s.', 'Microsoft 365', date_migration_string_local) %>
+ <%- @T('%s will only allow access via OAuth. Password-based access has not been supported since %s.', 'Microsoft 365', date_migration_string_local) %>
<% else: %> - <%- @T('%s will only allow access via OAuth. Password-based access will no longer be supported on %s.', 'Microsoft 365', date_migration_string_local) %>
+ <%- @T('%s will only allow access via OAuth. Password-based access is no longer supported on %s.', 'Microsoft 365', date_migration_string_local) %>
<% end %> <% end %> @@ -110,7 +110,7 @@ <% groupName = channel.group %> <% end %> <% if channel.group.active is false: %> - <%- @T('%s is inactive, please select a active one.', groupName) %> + <%- @T('%s is inactive, please select an active one.', groupName) %> <% else: %> <%= groupName %> <% end %> diff --git a/app/assets/javascripts/app/views/channel/sms_account_overview.jst.eco b/app/assets/javascripts/app/views/channel/sms_account_overview.jst.eco index b0b4630a1..effb13f51 100644 --- a/app/assets/javascripts/app/views/channel/sms_account_overview.jst.eco +++ b/app/assets/javascripts/app/views/channel/sms_account_overview.jst.eco @@ -59,7 +59,7 @@ <% groupName = channel.group %> <% end %> <% if channel.group.active is false: %> - <%- @T('%s is inactive, please select a active one.', groupName) %> + <%- @T('%s is inactive, please select an active one.', groupName) %> <% else: %> <%= groupName %> <% end %> diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco index a6268755b..44100ce79 100644 --- a/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco @@ -1,6 +1,6 @@
- <%- @T('Your tickets in process') %> + <%- @T('My tickets in process') %>
<%- @Icon('help') %>
@@ -8,6 +8,6 @@
<%- @Icon('in-process', "in-process-icon #{@StatsTicketInProcess.state}-color") %>
-
<%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %>
+
<%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %>
<%- @T('Average: %s%', @StatsTicketInProcess.average_per_agent) %>
diff --git a/app/assets/javascripts/app/views/generic/object_import/import_try.jst.eco b/app/assets/javascripts/app/views/generic/object_import/import_try.jst.eco index 5d80e6c03..ace5ed7cf 100644 --- a/app/assets/javascripts/app/views/generic/object_import/import_try.jst.eco +++ b/app/assets/javascripts/app/views/generic/object_import/import_try.jst.eco @@ -7,13 +7,13 @@ <%- @T('The following changes are made:') %>