Maintenance: Apply source string review changes.

nschlunder · Dec 15, 2021 · 0ccdfb3 · 0ccdfb3
1 parent 80e76fc
commit 0ccdfb3
Show file tree

Hide file tree

Showing 81 changed files with 241 additions and 234 deletions.
diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee
@@ -69,7 +69,7 @@ class ChannelChat extends App.ControllerSubContent
       name: 'fontSize'
       default: 'undefined'
       type: 'String'
-      description: __('CSS font-size with a unit like 12px, 1.5em. If left to undefined it inherits the font-size of the website.')
+      description: __('CSS font-size with a unit like 12px, 1.5em. If left undefined it inherits the font-size of the website.')
     }
     {
       name: 'flat'

diff --git a/app/assets/javascripts/app/controllers/_channel/google.coffee b/app/assets/javascripts/app/controllers/_channel/google.coffee
@@ -219,7 +219,7 @@ class ChannelAccountOverview extends App.ControllerSubContent
       error: (data) =>
         @notify
           type: 'error'
-          msg:  __('Failed to rollback migration of the channel!')
+          msg:  __('Failed to roll back the migration of the channel!')
     )
 
   groupChange: (e) =>

diff --git a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
@@ -210,7 +210,7 @@ class ChannelAccountOverview extends App.ControllerSubContent
       error: (data) =>
         @notify
           type: 'error'
-          msg:  __('Failed to rollback migration of the channel!')
+          msg:  __('Failed to roll back the migration of the channel!')
     )
 
   groupChange: (e) =>

diff --git a/app/assets/javascripts/app/controllers/_integration/check_mk.coffee b/app/assets/javascripts/app/controllers/_integration/check_mk.coffee
@@ -54,7 +54,7 @@ App.Config.set(
   {
     name: __('Checkmk')
     target: '#system/integration/check_mk'
-    description: __('An open source monitoring tool.')
+    description: __('An open-source monitoring tool.')
     controller: CheckMk
     state: State
     permission: ['admin.integration.check_mk']

diff --git a/app/assets/javascripts/app/controllers/_integration/cti.coffee b/app/assets/javascripts/app/controllers/_integration/cti.coffee
@@ -4,7 +4,7 @@ class Cti extends App.ControllerIntegrationBase
   featureConfig: 'cti_config'
   description: [
     [__('This service shows you contacts of incoming calls and a caller list in realtime.')]
-    [__('Also caller id of outbound calls can be changed.')]
+    [__('Caller ID of outbound calls can be changed as well.')]
   ]
   events:
     'click .js-select': 'selectAll'
@@ -135,7 +135,7 @@ class Form extends App.Controller
       }
     )
 
-    # blocked caller ids
+    # blocked caller IDs
     config.inbound.block_caller_ids = []
     @$('.js-inboundBlockCallerId .js-row').each(->
       caller_id = $(@).find('input[name="caller_id"]').val()

diff --git a/app/assets/javascripts/app/controllers/_integration/icinga.coffee b/app/assets/javascripts/app/controllers/_integration/icinga.coffee
@@ -23,7 +23,7 @@ App.Config.set(
   {
     name: __('Icinga')
     target: '#system/integration/icinga'
-    description: __('An open source monitoring tool.')
+    description: __('An open-source monitoring tool.')
     controller: Icinga
     state: State
     permission: ['admin.integration.icinga']

diff --git a/app/assets/javascripts/app/controllers/_integration/monit.coffee b/app/assets/javascripts/app/controllers/_integration/monit.coffee
@@ -23,7 +23,7 @@ App.Config.set(
   {
     name: __('Monit')
     target: '#system/integration/monit'
-    description: __('An open source monitoring tool.')
+    description: __('An open-source monitoring tool.')
     controller: Monit
     state: State
     permission: ['admin.integration.monit']

diff --git a/app/assets/javascripts/app/controllers/_integration/nagios.coffee b/app/assets/javascripts/app/controllers/_integration/nagios.coffee
@@ -23,7 +23,7 @@ App.Config.set(
   {
     name: __('Nagios')
     target: '#system/integration/nagios'
-    description: __('An open source monitoring tool.')
+    description: __('An open-source monitoring tool.')
     controller: Nagios
     state: State
   }

diff --git a/app/assets/javascripts/app/controllers/_integration/placetel.coffee b/app/assets/javascripts/app/controllers/_integration/placetel.coffee
@@ -4,7 +4,7 @@ class Placetel extends App.ControllerIntegrationBase
   featureConfig: 'placetel_config'
   description: [
     [__('This service shows you contacts of incoming calls and a caller list in realtime.')]
-    [__('Also caller id of outbound calls can be changed.')]
+    [__('Caller ID of outbound calls can be changed as well.')]
   ]
   events:
     'click .js-select': 'selectAll'
@@ -111,7 +111,7 @@ class Form extends App.Controller
       }
     )
 
-    # blocked caller ids
+    # blocked caller IDs
     config.inbound.block_caller_ids = []
     @$('.js-inboundBlockCallerId .js-row').each(->
       caller_id = $(@).find('input[name="caller_id"]').val()

diff --git a/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee b/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee
@@ -4,7 +4,7 @@ class SipgateIo extends App.ControllerIntegrationBase
   featureConfig: 'sipgate_config'
   description: [
     [__('This service shows you contacts of incoming calls and a caller list in realtime.')]
-    [__('Also caller id of outbound calls can be changed.')]
+    [__('Caller ID of outbound calls can be changed as well.')]
   ]
   events:
     'click .js-select': 'selectAll'
@@ -108,7 +108,7 @@ class Form extends App.Controller
       }
     )
 
-    # blocked caller ids
+    # blocked caller IDs
     config.inbound.block_caller_ids = []
     @$('.js-inboundBlockCallerId .js-row').each(->
       caller_id = $(@).find('input[name="caller_id"]').val()

diff --git a/app/assets/javascripts/app/controllers/_manage/ticket_auto_assignment.coffee b/app/assets/javascripts/app/controllers/_manage/ticket_auto_assignment.coffee
@@ -22,7 +22,7 @@ class App.SettingTicketAutoAssignment extends App.ControllerSubContent
     @html(App.view('settings/ticket_auto_assignment')())
 
     configure_attributes = [
-      { name: 'condition', display: __('Conditions for effected objects'), tag: 'ticket_selector', null: false, preview: false, action: false, hasChanged: false, article: false },
+      { name: 'condition', display: __('Conditions for affected objects'), tag: 'ticket_selector', null: false, preview: false, action: false, hasChanged: false, article: false },
     ]
 
     ticket_auto_assignment_selector = App.Setting.get('ticket_auto_assignment_selector')

diff --git a/app/assets/javascripts/app/controllers/_plugin/session_timeout.coffee b/app/assets/javascripts/app/controllers/_plugin/session_timeout.coffee
@@ -96,7 +96,7 @@ class SessionTimeout extends App.Controller
 
     @warningDialog = new App.ControllerModal(
       head:         __('Session')
-      message:      __('Due to inactivity are automatically logged out within the next 30 seconds.')
+      message:      __('Due to inactivity, you will be automatically logged out within the next 30 seconds.')
       keyboard:     true
       backdrop:     true
       buttonClose:  true

diff --git a/app/assets/javascripts/app/controllers/_profile/password.coffee b/app/assets/javascripts/app/controllers/_profile/password.coffee
@@ -37,7 +37,7 @@ class ProfilePassword extends App.ControllerSubContent
       @$('[name=password_new_confirm]').val('')
       @notify
         type:      'error'
-        msg:       __('Can\'t update password, your new passwords do not match. Please try again!')
+        msg:       __('Can\'t update password, your entered passwords do not match. Please try again!')
         removeAll: true
       return
     if !params['password_new']

diff --git a/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/holiday_selector.coffee
@@ -60,7 +60,7 @@ class App.UiElement.holiday_selector
       # check if entry already exists
       exists = item.find("[data-date=#{date}]").get(0)
       if exists
-        alert(App.i18n.translateInline('Aready exists!'))
+        alert(App.i18n.translateInline('This entry already exists!'))
         return
 
       # reset form input

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
@@ -244,7 +244,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
       params: params
     )
     configureAttributes = [
-      { name: 'data_option::diff', display: __('Default time Diff (minutes)'), tag: 'integer', null: true },
+      { name: 'data_option::diff', display: __('Default time diff (minutes)'), tag: 'integer', null: true },
     ]
     datetimeDiff = new App.ControllerForm(
       model:
@@ -258,7 +258,7 @@ class App.UiElement.object_manager_attribute extends App.UiElement.ApplicationUi
 
   @date: (item, localParams, params) ->
     configureAttributes = [
-      { name: 'data_option::diff', display: __('Default time Diff (hours)'), tag: 'integer', null: true },
+      { name: 'data_option::diff', display: __('Default time diff (hours)'), tag: 'integer', null: true },
     ]
     dateDiff = new App.ControllerForm(
       model:

diff --git a/app/assets/javascripts/app/controllers/_ui_element/postmaster_match.coffee b/app/assets/javascripts/app/controllers/_ui_element/postmaster_match.coffee
@@ -15,11 +15,11 @@ class App.UiElement.postmaster_match
           },
           {
             value:    'cc'
-            name:     __('Cc')
+            name:     __('CC')
           },
           {
             value:    'x-any-recipient'
-            name:     __('Any Recipient')
+            name:     __('Any recipient')
           },
           {
             value:    'subject'

diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee
@@ -362,10 +362,10 @@ class App.UiElement.ticket_perform_action
     elementRow.find('.js-setNotification').empty()
 
     options =
-      'article_last_sender': __('Article Last Sender')
+      'article_last_sender': __('Sender of last article')
       'ticket_owner': __('Owner')
       'ticket_customer': __('Customer')
-      'ticket_agents': __('All Agents')
+      'ticket_agents': __('All agents')
 
     name = "#{attribute.name}::notification.#{notificationType}"
 

diff --git a/app/assets/javascripts/app/controllers/_ui_element/timezone.coffee b/app/assets/javascripts/app/controllers/_ui_element/timezone.coffee
@@ -24,5 +24,5 @@ class App.UiElement.timezone extends App.UiElement.ApplicationUiElement
     @selectedOptions(attribute, params)
 
     attribute.tag =        'searchable_select'
-    attribute.placeholder = App.i18n.translateInline('Enter timezone...')
+    attribute.placeholder = App.i18n.translateInline('Enter time zone')
     App.UiElement.searchable_select.render(attribute)
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
@@ -316,7 +316,7 @@ class App.TicketCreate extends App.Controller
 
     App.Ticket.configure_attributes.push {
       name: 'cc'
-      display: __('Cc')
+      display: __('CC')
       tag: 'input'
       type: 'text'
       maxlength: 1000

diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee
@@ -368,7 +368,7 @@ class App.CustomerChat extends App.Controller
       @switch(false)
       @notify(
         type: 'notice'
-        msg:  App.i18n.translateContent('Chat not answered, set to offline automatically.')
+        msg:  App.i18n.translateContent('Chat not answered, automatically set to offline.')
       )
     @idleTimeoutId = @delay(switchOff, @idleTimeout * 1000)
 

diff --git a/app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee b/app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee
@@ -71,7 +71,7 @@ class App.KnowledgeBaseContentController extends App.Controller
     @rerenderIfConfirmed()
 
   rerenderIfConfirmed: ->
-    text = App.i18n.translatePlain('Changes were made. Do you want to reload? You\'ll loose your changes')
+    text = App.i18n.translatePlain('Are you sure you want to reload? You have unsaved changes that will get lost')
     if confirm(text)
       @render()
 

diff --git a/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee b/app/assets/javascripts/app/controllers/knowledge_base/sidebar/attachments.coffee
@@ -110,7 +110,7 @@ class App.KnowledgeBaseSidebarAttachments extends App.Controller
 
 class DeleteConfirm extends App.ControllerConfirm
   content: ->
-    sentence = App.i18n.translateContent('Are you sure to delete')
+    sentence = App.i18n.translateContent('Are you sure you want to delete')
     "#{sentence} #{@attachment.filename}?"
   buttonSubmit: __('delete')
   onSubmit: ->

diff --git a/app/assets/javascripts/app/controllers/login.coffee b/app/assets/javascripts/app/controllers/login.coffee
@@ -20,7 +20,7 @@ class Login extends App.ControllerFullPage
     data = {}
     if window.location.hash is '#session_timeout'
       data = {
-        errorMessage: App.i18n.translateContent('Due to inactivity you are automatically logged out.')
+        errorMessage: App.i18n.translateContent('Due to inactivity, you have been automatically logged out.')
       }
 
     @title __('Sign in')

diff --git a/app/assets/javascripts/app/controllers/password_reset_verify.coffee b/app/assets/javascripts/app/controllers/password_reset_verify.coffee
@@ -69,7 +69,7 @@ class PasswordResetVerify extends App.ControllerFullPage
       @$('[name=password_confirm]').val('')
       @notify(
         type:      'error'
-        msg:       __('Can\'t update password, your new passwords do not match. Please try again!')
+        msg:       __('Can\'t update password, your entered passwords do not match. Please try again!')
         removeAll: true
       )
       return

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
@@ -326,7 +326,7 @@ class ArticleViewItem extends App.ControllerObserver
         if data.encryption.success
           @notify
             type: 'success'
-            msg:  App.i18n.translateContent('Decryption success!')
+            msg:  App.i18n.translateContent('Decryption successful!')
         else if data.encryption.comment
           comment = App.i18n.translateContent('Decryption failed!') + ' ' + App.i18n.translateContent(data.encryption.comment || '')
           @notify

diff --git a/app/assets/javascripts/app/controllers/time_accounting.coffee b/app/assets/javascripts/app/controllers/time_accounting.coffee
@@ -103,7 +103,7 @@ class TimeAccounting extends App.ControllerSubContent
     )
 
     configure_attributes = [
-      { name: 'condition',  display: __('Conditions for effected objects'), tag: 'ticket_selector', null: false, preview: false, action: false, hasChanged: false },
+      { name: 'condition',  display: __('Conditions for affected objects'), tag: 'ticket_selector', null: false, preview: false, action: false, hasChanged: false },
     ]
 
     filter_params = App.Setting.get('time_accounting_selector')

diff --git a/app/assets/javascripts/app/controllers/user_profile.coffee b/app/assets/javascripts/app/controllers/user_profile.coffee
@@ -122,7 +122,7 @@ class ActionRow extends App.ControllerObserverActionRow
       error: (data, status, xhr) =>
         @notify
           type:      'error'
-          msg:       App.i18n.translateContent('Failed to sent Email "%s". Please contact an administrator.', user.email)
+          msg:       App.i18n.translateContent('Failed to send email to "%s". Please contact an administrator.', user.email)
           removeAll: true
     )
 

diff --git a/app/assets/javascripts/app/lib/base/word_filter.js b/app/assets/javascripts/app/lib/base/word_filter.js
@@ -74,7 +74,7 @@ window.word_filter = function(editor){
         }
     })
 
-    // style and align is handled by utils.coffee it self, don't clean it here
+    // style and align is handled by utils.coffee itself, don't clean it here
     //$('[style]', editor).removeAttr('style');
     //$('[align]', editor).removeAttr('align');
     $('span', editor).replaceWith(function() {return $(this).contents();});

diff --git a/app/assets/javascripts/app/models/_application_model.coffee b/app/assets/javascripts/app/models/_application_model.coffee
@@ -201,7 +201,7 @@ set new attributes of model (remove already available attributes)
       },
       'assignment_timeout': {
         name:    'assignment_timeout'
-        display: __('Assignment Timeout')
+        display: __('Assignment timeout')
         tag:     'input'
         type:    'text'
         limit:   100
@@ -696,7 +696,7 @@ set new attributes of model (remove already available attributes)
       # lookup relations
       if attribute.relation
 
-        # relations - not calling object it self, to prevent loops
+        # relations - not calling object itself, to prevent loops
         if !_.contains(classNames, @className)
 
           # only if relation model exists

diff --git a/app/assets/javascripts/app/models/group.coffee b/app/assets/javascripts/app/models/group.coffee
@@ -5,9 +5,9 @@ class App.Group extends App.Model
 
   @configure_attributes = [
     { name: 'name',                 display: __('Name'),              tag: 'input',  type: 'text', limit: 100, null: false },
-    { name: 'assignment_timeout',   display: __('Assignment Timeout'), tag: 'input', note: __('Assignment timeout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.'), type: 'text', limit: 100, null: true },
+    { name: 'assignment_timeout',   display: __('Assignment timeout'), tag: 'input', note: __('Assignment timeout in minutes if assigned agent is not working on it. Ticket will be shown as unassigend.'), type: 'text', limit: 100, null: true },
     { name: 'follow_up_possible',   display: __('Follow-up possible'),tag: 'select', default: 'yes', options: { yes: 'yes', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, null: false, note: __('Follow-up for closed ticket possible or not.'), translate: true },
-    { name: 'follow_up_assignment', display: __('Assign Follow-Ups'), tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: __('Assign follow-up to latest agent again.'), translate: true },
+    { name: 'follow_up_assignment', display: __('Assign follow-ups'), tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: __('Assign follow-up to latest agent again.'), translate: true },
     { name: 'email_address_id',     display: __('Email'),             tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, do_not_log: true },
     { name: 'signature_id',         display: __('Signature'),         tag: 'select', multiple: false, null: true, relation: 'Signature', nulloption: true, do_not_log: true },
     { name: 'note',                 display: __('Note'),              tag: 'textarea', note: __('Notes are visible to agents only, never to customers.'), limit: 250, null: true },

diff --git a/app/assets/javascripts/app/models/job.coffee b/app/assets/javascripts/app/models/job.coffee
@@ -5,7 +5,7 @@ class App.Job extends App.Model
   @configure_attributes = [
     { name: 'name',                 display: __('Name'),                            tag: 'input',    type: 'text', limit: 100, null: false },
     { name: 'timeplan',             display: __('When should the job run?'),        tag: 'timer', null: true },
-    { name: 'condition',            display: __('Conditions for effected objects'), tag: 'ticket_selector', null: true, executionTime: true, noCurrentUser: true },
+    { name: 'condition',            display: __('Conditions for affected objects'), tag: 'ticket_selector', null: true, executionTime: true, noCurrentUser: true },
     { name: 'perform',              display: __('Execute changes on objects'),      tag: 'ticket_perform_action', null: true, notification: true, ticket_delete: true },
     { name: 'disable_notification', display: __('Disable Notifications'),           tag: 'boolean', default: true },
     { name: 'note',                 display: __('Note'),                            tag: 'textarea', note: __('Notes are visible to agents only, never to customers.'), limit: 250, null: true },

diff --git a/app/assets/javascripts/app/models/knowledge_base.coffee b/app/assets/javascripts/app/models/knowledge_base.coffee
@@ -209,7 +209,7 @@ class App.KnowledgeBase extends App.Model
       display: __('Icon Set')
       tag:     'iconset_picker'
       style:   'block'
-      help:    __('Every category in your knowledge base should be given a unique icon for maximum visual clarity. Each set below provides a wide range of icons to choose from, but beware-you can\'t mix and match different icons from different sets. Choose carefully!')
+      help:    __('Every category in your knowledge base should be given a unique icon for maximum visual clarity. Each set below provides a wide range of icons to choose from, but beware: You can\'t mix and match different icons from different sets. Choose carefully!')
       null:    false
       screen:
         admin_style_iconset:

diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee
@@ -4,7 +4,7 @@ class App.Organization extends App.Model
   @url: @apiPath + '/organizations'
   @configure_attributes = [
     { name: 'name',           display: __('Name'),                tag: 'input',     type: 'text', limit: 100, null: false, info: true },
-    { name: 'shared',         display: __('Shared organization'), tag: 'boolean',   note: __('Customers in the organization can view each other items.'), type: 'boolean', default: true, null: false, info: false },
+    { name: 'shared',         display: __('Shared organization'), tag: 'boolean',   note: __("Customers in the organization can view each other's items."), type: 'boolean', default: true, null: false, info: false },
     { name: 'created_by_id',  display: __('Created by'),    relation: 'User', readonly: 1, info: false },
     { name: 'created_at',     display: __('Created at'),    tag: 'datetime',  readonly: 1, info: false },
     { name: 'updated_by_id',  display: __('Updated by'),    relation: 'User', readonly: 1, info: false },

diff --git a/app/assets/javascripts/app/models/text_module.coffee b/app/assets/javascripts/app/models/text_module.coffee
@@ -38,25 +38,24 @@ class App.TextModule extends App.Model
 
   # coffeelint: disable=no_interpolation_in_single_quotes
   @description = __('''
-Create Text Modules to **spend less time writing responses**. Text Modules can include smart variables like the users name or email address.
+Create Text Modules to **spend less time writing responses**. Text Modules can include smart variables like the user's name or email address.
 
 Examples of snippets are:
 
 * Hello Mrs. #{ticket.customer.lastname},
 * Hello Mr. #{ticket.customer.lastname},
 * Hello #{ticket.customer.firstname},
-* My Name is #{user.firstname},
+* My name is #{user.firstname},
 
-Of course you can also use multi line snippets.
+Of course, you can also use multi-line snippets.
 
 Available objects are:
-* ticket (e. g. ticket.state, ticket.group)
-* ticket.customer (e. g. ticket.customer.firstname, ticket.customer.lastname)
-* ticket.owner (e. g. ticket.owner.firstname, ticket.owner.lastname)
-* ticket.organization (e. g. ticket.organization.name)
-* user (e. g. user.firstname, user.email)
+* ticket (e.g. ticket.state, ticket.group)
+* ticket.customer (e.g. ticket.customer.firstname, ticket.customer.lastname)
+* ticket.owner (e.g. ticket.owner.firstname, ticket.owner.lastname)
+* ticket.organization (e.g. ticket.organization.name)
+* user (e.g. user.firstname, user.email)
 
 To select placeholders from a list, just enter "::".
-
 ''')
   # coffeelint: enable=no_interpolation_in_single_quotes