Improved wording.

app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee

@@ -32,7 +32,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
     @ajax(
       id:          'knowledge_bases_init_admin'
       type:        'GET'
-      url:         @apiPath + '/knowledge_bases/manage/init'
+      url:         "#{@apiPath}/knowledge_bases/manage/init"
       processData: true
       success:     (data, status, xhr) =>
         App.Collection.loadAssets(data)
@@ -93,7 +93,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
 
     @tabs = [
       {
-        name:       'Style'
+        name:       'Theme'
         target:     'style'
         controller: App.KnowledgeBaseForm
         params:     _.extend({}, params, { screen: 'style', split: true })
@@ -117,7 +117,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs
 
     if !App.Config.get('system_online_service')
       @tabs.splice(-1, 0, {
-        name:       'Custom Address'
+        name:       'Custom URL'
         target:     'custom_address'
         controller: App.KnowledgeBaseCustomAddressForm,
         params:     _.extend({}, params, { screen: 'custom_address' })

app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee

@@ -93,7 +93,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
   model:
     configure_attributes: [
         name:    'visibility'
-        display: 'Visibility'
+        display: 'Permissions'
         tag:     'radio'
         default: false
         options: [
@@ -103,7 +103,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
           ,
             value: 'internal'
             name:  'Internal'
-            note:  'Only visible to agents & editors'
+            note:  'Visible to agents & editors'
           ,
             value: 'published'
             name:  'Public'
@@ -119,7 +119,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm
         default: 'now'
         options: [
             value: 'now'
-            name:  'Now'
+            name:  'now'
           ,
             value: 'scheduled'
             name:  'Schedule for'

app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee

@@ -6,7 +6,7 @@ class App.KnowledgeBaseDeleteAction
     if @object instanceof App.KnowledgeBaseCategory and !@object.isEmpty()
       @showCannotDelete(
         'Cannot delete category',
-        'Please delete all children categories and answers first.'
+        'Delete all child categories and answers, then try again.'
       )
 
       return
@@ -19,7 +19,7 @@ class App.KnowledgeBaseDeleteAction
 
     @dialog = new App.ControllerConfirm(
       head:      'Delete'
-      message:   "Are you sure to delete \"#{translation?.title}\"?"
+      message:   "Are you sure you want to delete \"#{translation?.title}\"?"
       callback:  @doDelete
       container: @parentController.el
       onSubmit: ->

app/assets/javascripts/app/controllers/widget/http_log.coffee

@@ -51,7 +51,6 @@ class Show extends App.ControllerModal
     super
 
   content: ->
-    console.log('cont')
     App.view('widget/http_log_show')(
       record: @record
     )

app/assets/javascripts/app/controllers/widget/ticket_stats.coffee

@@ -161,7 +161,6 @@ class App.TicketStatsList extends App.Controller
       ticket_ids_show = @ticket_ids
 
     tickets = (App.Ticket.fullLocal(id) for id in ticket_ids_show)
-    console.log tickets
 
     @html App.view('widget/ticket_stats_list')(
       user:            @user

app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee

@@ -34,7 +34,7 @@ class App.MultiLocalesRow extends App.Controller
         name:        name
         value:       value
         null:        false
-        placeholder: 'Select locale:'
+        placeholder: 'Select locale...'
         options:     [] #formattedLocales
         class:       'form-control--small'
     )

app/assets/javascripts/app/models/knowledge_base.coffee

@@ -128,11 +128,10 @@ class App.KnowledgeBase extends App.Model
           shown: true
     }, {
       name: 'color_highlight'
-      display: 'Highlight Color'
+      display: 'Icon & Link Color'
       tag: 'color'
       style: 'block'
       null: false
-      help: 'The highlight color is used to make elements of the interface stand out. For example the links and icons.'
       screen:
         admin_style_color_highlight:
           display:    false
@@ -199,7 +198,7 @@ class App.KnowledgeBase extends App.Model
       display: 'Icon Set'
       tag:     'iconset_picker'
       style:   'block'
-      help:    "Pick an iconset that fits your style. The icons from this set can be assigned to categories. Choose wisely because the icon sets don't match with each other. If you change it later on you'll have to reset every icon."
+      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:
@@ -210,7 +209,7 @@ class App.KnowledgeBase extends App.Model
       tag: 'multi_locales'
       style: 'block'
       null: false
-      help: 'Set up the languages for the Knowledge Base. Zammad detects the prefered language of the visitor. When its not available it will fall back to the primary language.'
+      help: 'You can provide different versions of your knowledge base for different locales. Add a language below, then select it in the Knowledge Base Editor to add your translations.'
       screen:
         admin_languages:
           shown: true
@@ -218,11 +217,11 @@ class App.KnowledgeBase extends App.Model
           shown: true
     }, {
       name:    'custom_address'
-      display: 'Custom Address'
+      display: 'Custom URL'
       tag:     'input'
       style:   'block'
       null:    true
-      help:    'Fill in full domain (e.g. example.com or example.com/help) or path (e.g. /support) to use custom address. See Apache or Nginx for further instructions'
+      help:    'The default URL for your knowledge base is e.g. example.com or example.com/help. To serve it from a custom URL instead, enter the destination below (e.g., "/support", "example.com", or "example.com/support"). Then, follow the directions under "Web Server Configuration" to complete the process.'
       screen:
         admin_custom_address:
           shown: true

app/assets/javascripts/app/views/generic/error/placeholder.jst.eco

@@ -2,6 +2,6 @@
   <%- @icon %>
   <h2><% if @status isnt undefined: %><%- @T('Status Code') %>: <%= @status %>. <% end %><%- @T(@detail) %></h2>
   <% if @action: %>
-  <div class="btn btn--action js-action"><%= @T(@action) %></div>
+  <div class="btn btn--action js-action"><%- @T(@action) %></div>
   <% end %>
 </div>

app/assets/javascripts/app/views/generic/icon_picker.jst.eco

@@ -6,7 +6,7 @@
   <%- @Icon('arrow-down', 'dropdown-arrow') %>
 </div>
 <div class="dropdown-menu dropdown-menu-left js-dropdown">
-  <input type="search" class="dropdown-filter js-filter-icons" placeholder="<%= @T('Filter icons') %>">
+  <input type="search" class="dropdown-filter js-filter-icons" placeholder="<%- @T('Search...') %>">
   <ul class="js-iconGrid dropdown-grid" role="menu"></ul>
   <div class="dropdown-filter-placeholder">
     <span class="js-noMatch">¯\_(ツ)_/¯</span>

app/assets/javascripts/app/views/generic/multi_locales.jst.eco

@@ -2,7 +2,7 @@
   <thead>
     <tr>
       <th width="85%"><%- @T('Language') %>
-      <th width="5%"><%- @T('Primary') %>
+      <th width="5%"><%- @T('Default') %>
       <th width="10%"><%- @T('Delete') %>
   </thead>
   <tbody>

app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco

@@ -13,6 +13,6 @@
     <% end %>
   </div>
   <% if @object.active is false: %>
-    <div class="recipientList-status"><%= @Ti('inactive') %></div>
+    <div class="recipientList-status"><%- @Ti('inactive') %></div>
   <% end %>
 </li>

app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco

@@ -11,7 +11,7 @@
     <span class="recipientList-detail">- <%= @objectCount %> <%- @T(@objectSingels) %></span>
   </div>
   <% if @organization.active is false: %>
-    <div class="recipientList-status"><%= @Ti('inactive') %></div>
+    <div class="recipientList-status"><%- @Ti('inactive') %></div>
   <% end %>
   <%- @Icon('arrow-right', 'recipientList-arrow') %>
 </li>

app/assets/javascripts/app/views/knowledge_base/_answer_attachments.jst.eco

@@ -1,6 +1,6 @@
 <% if @attachments: %>
 <div class="knowledge-base-article-attachments">
-	<h2><%= @Ti('Attachments') %></h2>
+	<h2><%- @Ti('Attachments') %></h2>
 	<ul class="knowledge-base-article-attachments-list">
 	<% for attachment in @attachments: %>
 	<li>

app/assets/javascripts/app/views/knowledge_base/_reader_answer_meta.jst.eco

@@ -1,7 +1,7 @@
-<%= @T(@answer.can_be_published_state()) %>
+<%- @T(@answer.can_be_published_state()) %>
 
 <% if user = @answer.can_be_published_by(): %>
-  <%= @T('by') %>
+  <%- @T('by') %>
   <%= user.displayName() %>
 <% end %>
 

app/assets/javascripts/app/views/knowledge_base/content.jst.eco

@@ -1,11 +1,11 @@
 <% if @missingTranslation(): %>
-  <div class="js-alert alert alert--warning alert--square"><%= @T('No translation for this locale available') %></div>
+  <div class="js-alert alert alert--warning alert--square"><%- @T('No translation for this locale available') %></div>
 <% end %>
 
 <div class="main flex vertical end">
   <div class="page-header">
     <div class="page-header-title">
-      <h2><%= @object.objectActionName() %></h2>
+      <h2><%- @T(@object.objectActionName()) %></h2>
       <% if @object.constructor.canBePublished?(): %>
         <%- @V('knowledge_base/content_can_be_published_header_suffix', object: @object) %>
       <% end %>
@@ -15,14 +15,14 @@
 
   <div class="horizontal">
     <a class="btn btn js-discard hide">
-      <%= @T('Discard your unsaved changes') %>
+      <%- @T('Discard your unsaved changes.') %>
     </a>
 
     <% if @object.constructor.canBePublished?(): %>
       <div class="js-submitContainer"></div>
     <% else: %>
       <a class="btn btn--primary js-submit">
-        <%= @T('Update') %>
+        <%- @T('Update') %>
       </a>
     <% end %>
   </div>

app/assets/javascripts/app/views/knowledge_base/content_can_be_published_header_suffix.jst.eco

@@ -1,15 +1,15 @@
 <span class="suffix js-published-header-suffix">
-  <span class="<%= @object.can_be_published_state_css() %>"><span class="label-text"><%= @T(@object.can_be_published_state()) %></span></span>
+  <span class="<%= @object.can_be_published_state_css() %>"><span class="label-text"><%- @T(@object.can_be_published_state()) %></span></span>
 
   <% if @object.can_be_published_internal_in_future(): %>
-    <span class="label-warning"><span class="label-text"><%= @T('Will be internal') %> <%= @humanTime @object.internal_at %></span></span>
+    <span class="label-warning"><span class="label-text"><%- @T('Will be internal') %> <%= @humanTime @object.internal_at %></span></span>
   <% end %>
 
   <% if @object.can_be_published_publish_in_future(): %>
-    <span class="label-warning"><span class="label-text"><%= @T('Will be published') %> <%= @humanTime @object.published_at %></span></span>
+    <span class="label-warning"><span class="label-text"><%- @T('Will be published') %> <%= @humanTime @object.published_at %></span></span>
   <% end %>
 
   <% if @object.can_be_published_archive_in_future(): %>
-    <span class="label-warning"><span class="label-text"><%= @T('Will be archived') %> <%- @humanTime @object.archived_at %></span></span>
+    <span class="label-warning"><span class="label-text"><%- @T('Will be archived') %> <%- @humanTime @object.archived_at %></span></span>
   <% end %>
 </span>

app/assets/javascripts/app/views/knowledge_base/delete.coffee

@@ -10,7 +10,7 @@ class App.KnowledgeBaseDelete extends App.KnowledgeBaseForm
     formController = @formControllers[0]
 
     if !@isTitleMatching()
-      formController.showAlert(App.i18n.translateInline('Please enter title to confirm'))
+      formController.showAlert(App.i18n.translateInline('Confirmation failed.'))
       return
 
     formController.hideAlert()
@@ -46,8 +46,8 @@ class App.KnowledgeBaseDelete extends App.KnowledgeBaseForm
             model:   'translation'
             style:   'block'
             null:    true
-            display: 'Delete this Knowledge Base'
-            help:    "This action cannot be undone. This will permanently delete \"#{@object().guaranteedTitle()}\". Please type in the name \"#{@object().guaranteedTitle()}\" of the Knowledge Base to confirm."
+            display: 'Permanently Delete Knowledge Base'
+            help:    "Deleting your knowledge base requires an additional verification step. To proceed, enter its name below (\"#{@object().guaranteedTitle()}\"). THIS ACTION CANNOT BE UNDONE."
             tag:     'input'
           }
         ]

app/assets/javascripts/app/views/knowledge_base/navigation.jst.eco

@@ -32,7 +32,7 @@
       class="btn btn--action js-edit <% if @edit.enabled: %>btn--active<% end %>"
       <% if @search.enabled: %>disabled<% end %>
       >
-      <%= @T('Edit') %>
+      <%- @T('Edit') %>
     </a>
   <% end %>
   <div class="btn btn--action btn--split--first js-pickedLanguage"><%= @kbLocales.selected?.systemLocale().locale %></div>

app/assets/javascripts/app/views/knowledge_base/scheduled_widget.jst.eco

@@ -1,5 +1,5 @@
 <%- @Icon('clock') %>
-<div class="scheduled-widget-label"><%= @T('Scheduled for') %> <%= @timestamp %></div>
+<div class="scheduled-widget-label"><%- @T('Scheduled for') %> <%- @timestamp %></div>
 <a class="btn btn--action btn--small scheduled-widget-delete js-delete">
-  <%- @Icon('diagonal-cross') %><span><%= @T('Cancel') %>
+  <%- @Icon('diagonal-cross') %><span><%- @T('Cancel') %>
 </a>

app/assets/javascripts/app/views/knowledge_base/search_field_panel.jst.eco

@@ -2,7 +2,7 @@
 
 <div class="js-placeholderEmpty help-block help-block--center hide">
   <%- @Icon('mood-ok') %>
-  <div class='help-block--inner'><%= @T('empty') %></div>
+  <div class='help-block--inner'><%- @T('Empty') %></div>
 </div>
 
 <div class="js-placeholderError help-block help-block--center hide">

app/assets/javascripts/app/views/knowledge_base/search_field_widget.jst.eco

@@ -1,4 +1,4 @@
-<input class="js-searchField form-control" name="query" placeholder="<%= @T('Search') %> <%= @placeholder_suffix %>" type="search" autocomplete="off">
+<input class="js-searchField form-control" name="query" placeholder="<%- @Ti('Search') %> <%= @placeholder_suffix %>" type="search" autocomplete="off">
 <%- @Icon('magnifier') %>
 <div class="search-loader"><%- @Icon('spinner-small') %></div>
 <a class="empty-search js-emptySearchButton">

app/assets/javascripts/app/views/knowledge_base/sidebar/actions.jst.eco

@@ -7,7 +7,7 @@
           <%- @T(name) %>
         <% end %>
       <% else: %>
-        <%= @T(button.name) %>
+        <%- @T(button.name) %>
       <% end %>
     </a>
   <% end %>

app/assets/javascripts/app/views/knowledge_base/sidebar/attachments.jst.eco

@@ -1,5 +1,5 @@
 <div class="sidebar-block-header">
-  <h2><%= @T('Attachments') %></h2>
+  <h2><%- @T('Attachments') %></h2>
 </div>
 
 <div class="dropContainer">
@@ -38,7 +38,7 @@
     <% uid =  _.uniqueId('fileUpload_') %>
     <input multiple="multiple" type="file" name="file" id="<%- uid %>">
     <label class="attachmentPlaceholder-label" for="<%- uid %>">
-      <span><%= @T('Add') %></span>
+      <span><%- @T('Add') %></span>
     </label>
   </div>
 

app/assets/javascripts/app/views/knowledge_base/sidebar/generic_list.jst.eco

@@ -1,13 +1,13 @@
 <div class="sidebar-block-header">
-  <h2><%= @T(@title) %></h2>
+  <h2><%- @T(@title) %></h2>
 </div>
 
 <div class="btn-list horizontal">
   <a href="#" class="btn btn--action btn--small btn--create js-add" <% if !@enabled: %>disabled<% end %> >
-    <%- @Icon('plus-small') %> <span><%= @T('Add') %></span>
+    <%- @Icon('plus-small') %> <span><%- @T('Add') %></span>
   </a>
   <a href="#" class="js-reorder btn btn--action btn--small" <% if !@enabled: %>disabled<% end %>>
-    <%- @Icon('rearange') %> <span><%= @T('Change order') %></span>
+    <%- @Icon('rearange') %> <span><%- @T('Change order') %></span>
   </a>
 </div>
 
@@ -33,7 +33,7 @@
     <% end %>
   <% else: %>
     <li>
-      <span class="nav-pills-placeholder"><%= @T(@emptyNote) %></span>
+      <span class="nav-pills-placeholder"><%- @T(@emptyNote) %></span>
     </li>
   <% end %>
 </ul>

app/assets/javascripts/app/views/knowledge_base/sidebar/linked_tickets.jst.eco

@@ -1,9 +1,9 @@
 <div class="sidebar-block-header">
-  <h2><%= @T('Linked Tickets') %></h2>
+  <h2><%- @T('Linked Tickets') %></h2>
 </div>
 
 <%- @V('generic/ticket_list', show_max: 5, tickets: @tickets, object: 'Ticket') %>
 
 <a class="btn btn--action btn--small js-add" href="#">
-  <%- @Icon('plus-small') %> <span><%= @T('Link Ticket') %></span>
+  <%- @Icon('plus-small') %> <span><%- @T('Add') %></span>
 </a>

app/assets/javascripts/app/views/layout_ref/kb_link_answer_to_answer_ref.jst.eco

@@ -1,7 +1,7 @@
 <div class="main flex vertical end">
   <div class="page-header">
     <div class="page-header-title">
-      <h2>Edit Answer</h2>
+      <h2><%- @T('Edit Answer') %></h2>
     </div>
   </div>
   <form class="form--grid js-form"></form>

app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco

@@ -20,7 +20,7 @@
           <td>Create a book in Pages</td>
           <td class="table-buttons">
             <div class="btn btn--action btn--primary btn--small js-link">
-              <%- @Icon('plus-small') %> <span><%= @T('link') %></span>
+              <%- @Icon('plus-small') %> <span><%- @T('link') %></span>
             </div>
           </td>
         </tr>
@@ -29,7 +29,7 @@
           <td>Publish your book with Pages</td>
           <td class="table-buttons">
             <div class="btn btn--action btn--primary btn--small js-link">
-              <%- @Icon('plus-small') %> <span><%= @T('link') %></span>
+              <%- @Icon('plus-small') %> <span><%- @T('link') %></span>
             </div>
           </td>
         </tr>
@@ -38,7 +38,7 @@
           <td>Record audio in Pages, Numbers, and Keynote for iOS and Mac</td>
           <td class="table-buttons">
             <div class="btn btn--action btn--primary btn--small is-disabled">
-              <%= @T('already linked') %>
+              <%- @T('already linked') %>
             </div>
           </td>
         </tr>
@@ -47,7 +47,7 @@
           <td>Use advanced book creation options in Pages</td>
           <td class="table-buttons">
             <div class="btn btn--action btn--primary btn--small js-link">
-              <%- @Icon('plus-small') %> <span><%= @T('link') %></span>
+              <%- @Icon('plus-small') %> <span><%- @T('link') %></span>
             </div>
           </td>
         </tr>

app/assets/javascripts/app/views/navigation/no_result.jst.eco

@@ -1,4 +1,4 @@
 <li class="global-search-detail-no-result alert alert--warning horizontal" role="alert">
   <%- @Icon('mood-sad') %>
-  <span><%= @T('There is no match for your search.') %></span>
+  <span><%- @T('There is no match for your search.') %></span>
 </li>

app/assets/javascripts/app/views/popover/kb_generic.jst.eco

@@ -3,7 +3,7 @@
   <div class="state-badge">
     <%- @Icon('task-state', @object.parent().can_be_published_state()) %>
     <span class="<%= @object.parent().can_be_published_state_css() %>">
-      <%= @T(@object.parent().can_be_published_state()) %>
+      <%- @T(@object.parent().can_be_published_state()) %>
     </span>
   </div>
 

app/models/knowledge_base.rb

@@ -147,15 +147,15 @@ class KnowledgeBase < ApplicationModel
 
     # not domain, but no leading slash
     if !custom_address.include?('.') && custom_address[0] != '/'
-      errors.add(:custom_address, 'Path requires leading slash')
+      errors.add(:custom_address, 'must begin with a slash ("/").')
     end
 
     if custom_address.include?('://')
-      errors.add(:custom_address, 'Full domain should be entered without protocol')
+      errors.add(:custom_address, 'must not include a protocol (e.g., "http://" or "https://").')
     end
 
     if custom_address.last == '/'
-      errors.add(:custom_address, 'No trailing slash')
+      errors.add(:custom_address, 'must not end with a slash ("/").')
     end
 
     if custom_address == '/' # rubocop:disable Style/GuardClause