diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee
index 3ee85be21..a62fe8497 100644
--- a/app/assets/javascripts/app/controllers/_channel/chat.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee
@@ -32,7 +32,7 @@ class ChannelChat extends App.ControllerSubContent
name: 'chatId'
default: '1'
type: 'Number'
- description: __('Identifier of the chat-topic.')
+ description: __('Identifier of the chat topic.')
}
{
name: 'show'
diff --git a/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee b/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee
index 6bd151608..5cbadea4b 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee
@@ -11,13 +11,13 @@ class App.FirstStepsClues extends App.Controller
{
container: '.search-holder'
headline: __('Search')
- text: __('Here you can search for tickets, customers and organizations. Use the wildcard §*§ to find everything. E. g. §smi*§ or §rosent*l§. You also can use ||double quotes|| for searching phrases §"some phrase"§.')
+ text: __('Here you can search for tickets, customers, and organizations. Use the asterisk §*§ to find anything, e.g. §smi*§ or §rosent*l§. You also can use ||quotation marks|| for searching phrases: §"some phrase"§.')
actions: []
}
{
container: '.user-menu .add'
headline: __('Create')
- text: __('Here you can create new tickets. Also if you have the permissions you can create new customers and organizations.')
+ text: __('Here you can create new tickets. Also, if you have the permission, you can create new customers and organizations.')
actions: [
'hover .navigation',
'hover .user-menu .add'
@@ -26,7 +26,7 @@ class App.FirstStepsClues extends App.Controller
{
container: '.user-menu .user .dropdown-menu'
headline: __('Personal Settings')
- text: __('Here you can sign out, change the frontend language and see your last viewed items.')
+ text: __('Here you can sign out, change the frontend language, and see your last viewed items.')
actions: [
'hover .navigation',
'click .user-menu .user .js-action',
@@ -36,7 +36,7 @@ class App.FirstStepsClues extends App.Controller
{
container: '.js-overviewsMenuItem'
headline: __('Overviews')
- text: __('Here you find your ticket overviews for open, assigned and escalated tickets.')
+ text: __('Here you find your ticket overviews for open, assigned, and escalated tickets.')
actions: [
'hover'
]
diff --git a/app/assets/javascripts/app/controllers/_dashboard/stats/ticket_waiting_time.coffee b/app/assets/javascripts/app/controllers/_dashboard/stats/ticket_waiting_time.coffee
index d792872da..35fb38252 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/stats/ticket_waiting_time.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/stats/ticket_waiting_time.coffee
@@ -7,7 +7,7 @@ class Stats extends App.ControllerDashboardStatsBase
state: 'supergood'
average_per_agent: 0
- data.StatsTicketWaitingTime.description = __('How long has each customer had to wait, on average, to get a response from you today?')
+ data.StatsTicketWaitingTime.description = __('How long did each customer have to wait, on average, to get a response from you today?')
content = App.view('dashboard/stats/ticket_waiting_time')(data)
if @$('.ticket_waiting_time').length > 0
diff --git a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
index f77020b82..20d52d3dc 100644
--- a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
@@ -4,7 +4,7 @@ class CheckMk extends App.ControllerIntegrationBase
featureConfig: 'check_mk_config'
description: [
[__('This service receives http requests or emails from %s and creates tickets with host and service.'), 'Checkmk']
- [__('If the host and service has recovered, the ticket can be closed automatically.')]
+ [__('If the host and service have recovered, the ticket can be closed automatically.')]
]
render: =>
diff --git a/app/assets/javascripts/app/controllers/_integration/cti.coffee b/app/assets/javascripts/app/controllers/_integration/cti.coffee
index 6efba83fa..c58022816 100644
--- a/app/assets/javascripts/app/controllers/_integration/cti.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/cti.coffee
@@ -261,7 +261,7 @@ App.Config.set(
{
name: __('CTI (generic)')
target: '#system/integration/cti'
- description: __('Generic API to integrate VoIP service provider with realtime push.')
+ description: __('Generic API to integrate VoIP service provider with real-time push.')
controller: Cti
state: State
}
diff --git a/app/assets/javascripts/app/controllers/_integration/icinga.coffee b/app/assets/javascripts/app/controllers/_integration/icinga.coffee
index 9dc6c8aff..2d171c81b 100644
--- a/app/assets/javascripts/app/controllers/_integration/icinga.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/icinga.coffee
@@ -4,7 +4,7 @@ class Icinga extends App.ControllerIntegrationBase
featureConfig: 'icinga_config'
description: [
[__('This service receives emails from %s and creates tickets with host and service.'), 'Icinga']
- [__('If the host and service is recovered again, the ticket will be closed automatically.')]
+ [__('If the host and service have recovered, the ticket can be closed automatically.')]
]
render: =>
diff --git a/app/assets/javascripts/app/controllers/_integration/monit.coffee b/app/assets/javascripts/app/controllers/_integration/monit.coffee
index 93e98d7f6..0f12c1d04 100644
--- a/app/assets/javascripts/app/controllers/_integration/monit.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/monit.coffee
@@ -4,7 +4,7 @@ class Monit extends App.ControllerIntegrationBase
featureConfig: 'monit_config'
description: [
[__('This service receives emails from %s and creates tickets with host and service.'), 'Monit']
- [__('If the host and service is recovered again, the ticket will be closed automatically.')]
+ [__('If the host and service have recovered, the ticket can be closed automatically.')]
]
render: =>
diff --git a/app/assets/javascripts/app/controllers/_integration/nagios.coffee b/app/assets/javascripts/app/controllers/_integration/nagios.coffee
index 0e7d34f96..20ca0bbcf 100644
--- a/app/assets/javascripts/app/controllers/_integration/nagios.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/nagios.coffee
@@ -4,7 +4,7 @@ class Nagios extends App.ControllerIntegrationBase
featureConfig: 'nagios_config'
description: [
[__('This service receives emails from %s and creates tickets with host and service.'), 'Nagios']
- [__('If the host and service is recovered again, the ticket will be closed automatically.')]
+ [__('If the host and service have recovered, the ticket can be closed automatically.')]
]
render: =>
diff --git a/app/assets/javascripts/app/controllers/_integration/slack.coffee b/app/assets/javascripts/app/controllers/_integration/slack.coffee
index 24a337ea6..dc69e8432 100644
--- a/app/assets/javascripts/app/controllers/_integration/slack.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/slack.coffee
@@ -31,7 +31,7 @@ class Slack extends App.ControllerIntegrationBase
{ name: 'webhook', display: __('Webhook'), tag: 'input', type: 'url', limit: 200, 'null': false, placeholder: 'https://hooks.slack.com/services/...' },
{ name: 'username', display: __('Username'), tag: 'input', type: 'text', limit: 100, 'null': false, placeholder: 'username' },
{ name: 'channel', display: __('Channel'), tag: 'input', type: 'text', limit: 100, 'null': true, placeholder: '#channel' },
- { name: 'icon_url', display: __('Icon Url'), tag: 'input', type: 'url', limit: 200, 'null': true, placeholder: 'https://example.com/logo.png' },
+ { name: 'icon_url', display: __('Icon URL'), tag: 'input', type: 'url', limit: 200, 'null': true, placeholder: 'https://example.com/logo.png' },
]
settings = []
diff --git a/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee b/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee
index 0a1fd32b4..e32f696cc 100644
--- a/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee
+++ b/app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee
@@ -400,13 +400,13 @@ App.Config.set(
{
key: '::'
hotkeys: false
- description: __('Inserts Text module')
+ description: __('Inserts text module')
globalEvent: 'richtext-insert-text-module'
}
{
key: '??'
hotkeys: false
- description: __('Inserts Knowledge Base answer')
+ description: __('Inserts knowledge base answer')
globalEvent: 'richtext-insert-kb-answer'
}
{
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 4c2975081..17aa92041 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
@@ -201,7 +201,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
)
configureAttributes = [
# coffeelint: disable=no_interpolation_in_single_quotes
- { name: 'data_option::linktemplate', display: __('Link-Template'), tag: 'input', type: 'text', null: true, default: '', placeholder: 'https://example.com/?q=#{object.attribute_name} - use ticket, user or organization as object' },
+ { name: 'data_option::linktemplate', display: __('Link Template'), tag: 'input', type: 'text', null: true, default: '', placeholder: 'https://example.com/?q=#{object.attribute_name} - use ticket, user or organization as object' },
# coffeelint: enable=no_interpolation_in_single_quotes
]
inputLinkTemplate = new App.ControllerForm(
@@ -339,7 +339,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
)
configureAttributes = [
# coffeelint: disable=no_interpolation_in_single_quotes
- { name: 'data_option::linktemplate', display: __('Link-Template'), tag: 'input', type: 'text', null: true, default: '', placeholder: 'https://example.com/?q=#{ticket.attribute_name}' },
+ { name: 'data_option::linktemplate', display: __('Link Template'), tag: 'input', type: 'text', null: true, default: '', placeholder: 'https://example.com/?q=#{ticket.attribute_name}' },
# coffeelint: enable=no_interpolation_in_single_quotes
]
inputLinkTemplate = new App.ControllerForm(
diff --git a/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee b/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee
index 245a9f7ad..ecb96e103 100644
--- a/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee
+++ b/app/assets/javascripts/app/controllers/knowledge_base/public_menu_manager.coffee
@@ -25,13 +25,13 @@ class App.KnowledgeBasePublicMenuManager extends App.Controller
[
{
- headline: __('Header menu'),
+ headline: __('Header Menu'),
identifier: 'header',
color: kb.color_header,
color_link: kb.color_header_link
},
{
- headline: __('Footer menu'),
+ headline: __('Footer Menu'),
identifier: 'footer',
color_link: 'hsl(207,12%,50%)'
}
diff --git a/app/assets/javascripts/app/models/chat.coffee b/app/assets/javascripts/app/models/chat.coffee
index 6782fbb50..8b81dc860 100644
--- a/app/assets/javascripts/app/models/chat.coffee
+++ b/app/assets/javascripts/app/models/chat.coffee
@@ -250,7 +250,7 @@ class App.Chat extends App.Model
@configure_attributes = [
{ name: 'name', display: __('Name'), tag: 'input', type: 'text', limit: 100, null: false },
{ name: 'note', display: __('Note'), tag: 'textarea', limit: 250, null: true },
- { name: 'max_queue', display: __('Max. clients in waitlist'), tag: 'input', default: 2 },
+ { name: 'max_queue', display: __('Max. clients on waitlist'), tag: 'input', default: 2 },
{ name: 'block_ip', display: __('Blocked IPs (separated by ;)'), tag: 'input', default: '', null: true },
{ name: 'allowed_websites', display: __('Allow websites (separated by ;)'), tag: 'input', default: '', null: true },
{ name: 'block_country', display: __('Blocked countries'), tag: 'column_select', multiple: true, null: true, default: '', options: @countries, seperator: ';' },
diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco
index 02e944ceb..6cbe1d8d7 100644
--- a/app/assets/javascripts/app/views/channel/chat.jst.eco
+++ b/app/assets/javascripts/app/views/channel/chat.jst.eco
@@ -154,7 +154,7 @@ $(function() {
</script>
<%- @T('Manually open chat') %>
-
<%- @T('If you want to open the chat by the press of a button set the option §show§ to §false§ and add the class §open-zammad-chat§ to the button.') %>
+
<%- @T('If you want to open the chat by clicking a button, set the option §show§ to §false§ and add the class §open-zammad-chat§ to the button.') %>
<%- @T('Should the emails from this mailbox be imported as an archive or as regular emails?') %>
-
<%- @T('Import as archive: |No notifications are sent|, the |tickets are closed| and original timestamps are used. You can still find them in Zammad using the search.') %>
+
<%- @T('Import as archive: |No notifications are sent|, the |tickets are closed|, and original timestamps are used. You can still find them in Zammad using the search.') %>
<%- @T('Import as regular: |Notifications are sent| and the |tickets are open| - you can find the tickets in the overview of open tickets.') %>
<%- @T('Should the emails from this mailbox be imported as an archive or as regular emails?') %>
-
<%- @T('Import as archive: |No notifications are sent|, the |tickets are closed| and original timestamps are used. You can still find them in Zammad using the search.') %>
+
<%- @T('Import as archive: |No notifications are sent|, the |tickets are closed|, and original timestamps are used. You can still find them in Zammad using the search.') %>
<%- @T('Import as regular: |Notifications are sent| and the |tickets are open| - you can find the tickets in the overview of open tickets.') %>