Maintenance: Improved translatable source strings.

app/assets/javascripts/app/controllers/_channel/_email_signature.coffee

@@ -12,9 +12,9 @@ class App.ChannelEmailSignature extends App.Controller
     template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
 
     description = __('''
-You can define different signatures for each group, which allows you to use a different signature for every department.
+You can define a separate signature for each group to use a different signature for each department.
 
-Once you have created a signature here, you will also need to edit the groups where you want to use it.
+Once you created a signature here, you will also need to edit the groups which should use it.
 ''')
 
     new App.ControllerTable(

app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee

@@ -17,7 +17,7 @@ class App.FirstStepsClues extends App.Controller
     {
       container: '.user-menu .add'
       headline: __('Create')
-      text: __('Here you can create new tickets. Also, if you have the permission, you can create new customers and organizations.')
+      text: __('Here you can create new tickets, customers and organizations (depending on your configured permissions).')
       actions: [
         'hover .navigation',
         'hover .user-menu .add'

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, responsibles, …) and customers.')
+          __('Agent and customer users can be grouped into organizations.')
         ]
         buttons: [
           { name: __('Import'), 'data-type': 'import', class: 'btn' }

app/assets/javascripts/app/models/group.coffee

@@ -10,7 +10,7 @@ class App.Group extends App.Model
     { name: 'reopen_time_in_days',  display: __('Reopening time in days'), tag: 'input',  type: 'integer', null: 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, display_warn: true, warn: __('This signature is inactive, it won\'t be included in the reply. Change state <a href="#channels/email">here</a>') },
+    { name: 'signature_id',         display: __('Signature'),         tag: 'select', multiple: false, null: true, relation: 'Signature', nulloption: true, do_not_log: true, display_warn: true, warn: __('This signature is inactive, it won\'t be included in the reply.') },
     { name: 'note',                 display: __('Note'),              tag: 'textarea', note: __('Notes are visible to agents only, never to customers.'), limit: 250, null: true },
     { name: 'updated_at',           display: __('Updated'),           tag: 'datetime', readonly: 1 },
     { name: 'active',               display: __('Active'),            tag: 'active', default: true },

app/assets/javascripts/app/models/postmaster_filter.coffee

@@ -7,7 +7,7 @@ class App.PostmasterFilter extends App.Model
     { name: 'name',           display: __('Name'),              tag: 'input', type: 'text', limit: 250, 'null': false },
     { name: 'channel',        display: __('Channel'),           type: 'input', readonly: 1 },
     { name: 'match',          display: __('Match all of the following'),      tag: 'postmaster_match', note: __('You can use regular expression by using "regex:your_reg_exp".') },
-    { name: 'perform',        display: __('Perform action of the following'), tag: 'postmaster_set', user_action: false },
+    { name: 'perform',        display: __('Perform actions'),   tag: 'postmaster_set', user_action: false },
     { name: 'note',           display: __('Note'),              tag: 'textarea', limit: 250, null: true },
     { name: 'updated_at',     display: __('Updated'),           tag: 'datetime', readonly: 1 },
     { name: 'active',         display: __('Active'),            tag: 'active', default: true },

app/models/knowledge_base/category.rb

@@ -134,7 +134,7 @@ class KnowledgeBase::Category < ApplicationModel
   private
 
   def cannot_be_child_of_parent
-    errors.add(:parent_id, __('cannot be a child of the parent')) if self_parent?(self)
+    errors.add(:parent_id, __('cannot be a subcategory of the parent category')) if self_parent?(self)
   end
   validate :cannot_be_child_of_parent
 

i18n/zammad.pot

@@ -935,6 +935,10 @@ msgstr ""
 msgid "Agent Name + FromSeparator + System Address Display Name"
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/organization.coffee
+msgid "Agent and customer users can be grouped into organizations."
+msgstr ""
+
 #: db/seeds/settings.rb
 msgid "Agent idle timeout"
 msgstr ""
@@ -5354,7 +5358,7 @@ msgid "Here you can add further links to your public FAQ page, which will be dis
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee
-msgid "Here you can create new tickets. Also, if you have the permission, you can create new customers and organizations."
+msgid "Here you can create new tickets, customers and organizations (depending on your configured permissions)."
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/customer_ticket_create.coffee
@@ -7776,10 +7780,6 @@ msgstr ""
 msgid "Organizations"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/organization.coffee
-msgid "Organizations are for any person in the system: agents (owners, responsibles, …) and customers."
-msgstr ""
-
 #: app/frontend/apps/mobile/pages/search/plugins/organization.ts
 msgid "Organizations with \"%s\""
 msgstr ""
@@ -8020,7 +8020,7 @@ msgid "People who create Tickets ask for help."
 msgstr ""
 
 #: app/assets/javascripts/app/models/postmaster_filter.coffee
-msgid "Perform action of the following"
+msgid "Perform actions"
 msgstr ""
 
 #: app/assets/javascripts/app/views/knowledge_base/delete.coffee
@@ -10904,7 +10904,7 @@ msgid "This service shows you contacts of incoming calls and a caller list in re
 msgstr ""
 
 #: app/assets/javascripts/app/models/group.coffee
-msgid "This signature is inactive, it won't be included in the reply. Change state <a href=\"#channels/email\">here</a>"
+msgid "This signature is inactive, it won't be included in the reply."
 msgstr ""
 
 #: app/assets/javascripts/app/views/widget/mention.jst.eco
@@ -12425,7 +12425,7 @@ msgid "You can create multiple chat topics."
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_channel/_email_signature.coffee
-msgid "You can define different signatures for each group, which allows you to use a different signature for every department.\n\nOnce you have created a signature here, you will also need to edit the groups where you want to use it."
+msgid "You can define a separate signature for each group to use a different signature for each department.\n\nOnce you created a signature here, you will also need to edit the groups which should use it."
 msgstr ""
 
 #: app/assets/javascripts/app/models/public_link.coffee
@@ -12826,7 +12826,7 @@ msgid "can't be used because *_id and *_ids are not allowed"
 msgstr ""
 
 #: app/models/knowledge_base/category.rb
-msgid "cannot be a child of the parent"
+msgid "cannot be a subcategory of the parent category"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_ui_element/core_workflow_condition.coffee