🔄 Sync https://github.com/supportpal/addon-language-english

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
           tools: composer:v2, supportpal/language-tools
 
       - name: PHP Syntax Check
-        uses: overtrue/phplint@8.0
+        uses: overtrue/phplint@8.2
         with:
           path: .
           options: --exclude=vendor

Lang/tr/core.php

@@ -361,7 +361,7 @@
      */
     "enable_ssl_warning"        => "Sayfa doğru yüklenmediğinde bu ayarı etkinleştirin, Lojisoft Destek!",
     "verify_frontend_loads"     => "Lütfen ana sayfa aşağıya doğru yüklendiğinden emin olun.",
-    "twig_operator_signature"   => "{{ operator.signature|raw }} birleştirme alanı çalışma zamanında işleneceğinden önizleme yanlış olabilir.",
+    "twig_operator_reply_template"   => "The {{ operator.reply_template|raw }} merge field will be processed at runtime hence the preview may be incorrect.",
 
     /*
      * 2.4.1
@@ -591,4 +591,32 @@
     "browse_image"              => "Browse for an image",
     "drop_image"                => "Drop an image here",
 
+    /*
+     * 4.2.0
+     */
+    "keyboard_shortcuts"        => "Keyboard Shortcuts",
+    "enable_keyboard_shortcuts" => "Enable keyboard shortcuts",
+    "shortcut_global"           => "Global shortcuts",
+    "shortcut_toggle"           => "Toggle the keyboard shortcuts dialog",
+    "shortcut_start_search"     => "Start search",
+    "shortcut_goto_new_ticket"  => "Go to the open new ticket page",
+    "shortcut_ticket_view"      => "Ticket view shortcuts",
+    "shortcut_focus_reply"      => "Focus the reply form",
+    "shortcut_focus_notes"      => "Focus the notes form",
+    "shortcut_focus_forward"    => "Focus the forward form",
+    "shortcut_toggle_user_tab"  => "Toggle the user details tab in the sidebar",
+    "shortcut_take_ticket"      => "Take ticket",
+    "shortcut_close_ticket"     => "Close ticket",
+    "shortcut_lock_ticket"      => "Close & lock ticket",
+    "shortcut_unlock_ticket"    => "Unlock ticket",
+    "shortcut_trash_ticket"     => "Move ticket to trash",
+    "shortcut_block_user"       => "Block user and move ticket to trash",
+    "shortcut_watch_ticket"     => "Watch ticket",
+    "shortcut_unwatch_ticket"   => "Unwatch ticket",
+    "shortcut_merge_ticket"     => "Merge ticket",
+    "shortcut_unmerge_ticket"   => "Unmerge ticket",
+    "shortcut_expand_all"       => "Expand all messages",
+    "shortcut_collapse_all"     => "Collapse all messages",
+    "shortcut_print_ticket"     => "Print ticket details and messages",
+
 );

Lang/tr/general.php

@@ -415,4 +415,15 @@
     "more_information"          => "More Information",
     "details"                   => "Details",
 
+    /*
+     * 4.1.0
+     */
+    "merge"                     => "Merge",
+
+   /*
+    * 4.2.0
+    */
+    "bridge_command_deprecated_warning" => "This command is deprecated and will be removed in the next major release. Call ':php :app_manager_path :command_name' instead.",
+    "bridge_command_obsolete_warning"   => "This command has moved. Call ':php :app_manager_path :command_name' instead.",
+
 );

Lang/tr/installer.php

@@ -192,4 +192,13 @@
      * 3.7.0
      */
     "troubleshooting_tips"      => "Get troubleshooting tips",
+
+    /*
+     * 4.2.0
+     */
+    "app_manager_version_not_supported" => "App Manager (:version) is not supported.",
+    "running_upgrade"           => "Running app upgrade",
+    "upgrade_complete_success"  => "App upgrade completed successfully.",
+    "app_manager_requires_update" => "Must update app-manager before running helpdesk update. :command",
+
 );

Lang/tr/log.php

@@ -114,7 +114,6 @@
      */
     "ticket_brand_disabled_reply"       => "Reply could not be added due to ticket belonging to a disabled brand #:rel.",
     "personal_signatures_updated"       => "Updated personal signatures.",
-    "operator_signatures_updated"       => "Updated :rel's signatures.",
     "check_email_failed"                => "Error: Failed to download email from account :old_value: ':rel'.",
     "ticket_added_cc"                   => "Email(s) :new_value added to CC address list for ticket #:rel.",
     "ticket_removed_cc"                 => "Email(s) :old_value removed from CC address list for ticket #:rel.",
@@ -203,4 +202,15 @@
      */
     "selfservice_article_neutral"       => "Neutrally rated article :rel.",
 
+    /*
+     * 4.1.0
+     */
+    "user_merged"                       => "User :old_value merged into user :rel.",
+    "user_organisation_merged"          => "User organisation :old_value merged into user organisation :rel.",
+
+    /*
+     * 4.2.0
+     */
+    "operator_reply_templates_updated"  => "Updated :rel's reply templates.",
+
 );

Lang/tr/messages.php

@@ -154,4 +154,10 @@
     "popup_blocked"         => "Your browser is blocking popup windows. Please enable popups and redirects on this website in order to use the preview feature.",
     "error_editing_message" => "There was an error while trying to edit this message.",
 
+    /*
+     * 4.1.1
+     */
+    "brand_not_enabled"     => "This action cannot be performed as the brand is not enabled.",
+    "cannot_reply_to_internal" => "A user cannot reply to an internal ticket.",
+
 );

Lang/tr/notification.php

@@ -24,4 +24,10 @@
      */
     "private_message_text"  => ":name sana yeni bir yol gönderdi <a href=':route'>private message</a>.",
 
+    /*
+     * 4.2.0
+     */
+    "new_mention"           => "New Mention",
+    "new_mention_text"      => ":name mentioned you in ticket #<a href=':route'>:number</a>.",
+
 );

Lang/tr/permission.php

@@ -77,7 +77,6 @@
     // User
     "usercustomfield"   => "Manage User Custom Fields",
     "organisationcustomfield" => "Manage Organisation Custom Fields",
-    "operatorsignature" => "Manage Operator Signatures",
 
     /*
      * 2.1.1
@@ -125,4 +124,9 @@
     "addon"             => "View and Manage Add-ons",
     "system_health"     => "View System Health",
 
+    /*
+     * 4.2.0
+     */
+    "operatorreplytemplate" => "Manage Operator Reply Templates",
+
 );

Lang/tr/ticket.php

@@ -244,7 +244,6 @@
     "ticket_notes_top"          => "Yalnızca üstte",
     "ticket_notes_messages"     => "Yalnızca mesajlarda",
 
-    "captcha_desc"              => "Yeni bilet açan kullanıcılara captcha gösterilmesi gerektiğinde.",
     "unregistered_only"         => "Yalnızca kayıtlı olmayan kullanıcılar",
 
     "allow_unauth_users"        => "Kimliği Doğrulanmamış Kullanıcılara İzin Ver",
@@ -276,7 +275,6 @@
     "add_tag"                   => "Add tag",
 
     "unlock"                    => "Kilidini Aç",
-    "merge"                     => "Birleştir",
     "merged"                    => "Birleştirilmiş",
     "unmerge"                   => "Unmerge",
     "close_and_lock"            => "Kapat ve Kilitle",
@@ -454,7 +452,6 @@
     "select_a_department_email" => "Select a department email...",
     "record_public_desc"        => "Toggle to only let the :record be accessible by yourself.",
     "record_group_desc"         => "If you wish to make the :record visible to only certain operator groups, leave blank to make visible to all operators.",
-    "ticket_format_desc"        => "Can contain alphanumeric characters and special characters <code>-_.+!*,</code><br />The following variables may also be used: %S for a sequential number | %N for a random number | %L for a random letter<br />Use {number} to repeat <strong>only</strong> after %N or %L, e.g. %N{4} equates to 4 random numbers, %L{3} equates to 3 random letters<br />The following <a href='http://php.net/manual/en/function.date.php' target='_blank'>PHP Date</a> Parameters prefixed with % Y,y,m,d,j,g,G,h,H,i,s",
 
     /*
      * 2.4.0
@@ -545,4 +542,15 @@
     "on_behalf_of"              => "Created on behalf of",
     "reply_canned_be_posted"    => "It is not currently possible to reply to this ticket; the channel or channel account may be disabled.",
 
+    /*
+     * 4.1.0
+     */
+    "ticket_format_desc"        => "Can contain alphanumeric characters and special characters <code>-_.+!*,</code><br />The following variables may also be used: %S for a sequential number | %N for a random number | %L for a random letter<br />Use {number} to repeat <strong>only</strong> after %N or %L, e.g. %N{4} equates to 4 random numbers, %L{3} equates to 3 random letters<br />The following <a href='http://php.net/manual/en/function.date.php' target='_blank'>PHP Date</a> Parameters prefixed with % Y,y,m,d,j,g,G,h,H,i,s",
+    "append_ip_address_api_desc" => "Append the user's IP address to the end of their ticket messages (requires user_ip_address data to be provided).",
+    "check_spam"                => "Check Spam Rules",
+    "check_spam_api_desc"       => "Block messages which match spam rules.",
+    "enable_throttling"         => "Enable Throttling",
+    "enable_throttling_api_desc" => "Limit the number of messages user's can post within a time frame. See <a href='https://docs.supportpal.com/current/App+Configuration#Throttling' target='_blank'>Throttling configuration</a> for more details on how to adjust the limits.",
+    "captcha_desc"              => "Yeni bilet açan kullanıcılara captcha gösterilmesi gerektiğinde.",
+
 );

Lang/tr/user.php

@@ -204,11 +204,6 @@
     "op_settings_individual_dept"   => "Assigned to individually:",
     "op_settings_individual_dept_desc" => "These departments are in addition to any departments the operator is assigned to via their groups above.",
     "also_registered_other_brand"   => "This user is also registered in the :brands brand.|This user is also registered in the :brands brands.",
-    "signature"                     => "Signature|Signatures",
-    "signature_desc"                => "Create personal ticket signatures, with the option to customise based on the brand/department of the ticket. The default signature is used when a signature for a specific department and/or brand cannot be found.",
-    "operator_signature"            => "Operator Signature|Operator Signatures",
-    "ticket_signature_desc"         => "Set the operator's default ticket signature.",
-    "operator_signature_desc"       => "Further signatures for specific departments and/or brands can be set in the <a href=':route' target='_blank'>Operator Signatures</a> section.",
     "view_organisation"             => "Kullanıcıları Görüntüle",
     "new_owner"                     => "Yeni sahibi",
     "operator_role"                 => "Operatör Rolü|Operatör Rolleri",
@@ -339,7 +334,7 @@
     "logged_in"                     => "Logged In",
     "revoke_session_desc"           => "Revoking a session will log the device out of the operator panel. It will also revoke all remember me tokens for other devices.",
 
-    /**
+    /*
      * 4.0.0
      */
     "verify_phone_number"           => "Verify Phone Number",
@@ -349,4 +344,22 @@
     "verify_phone_code_error"       => "Code could not be verified.",
     "logged_in_as"                  => "Logged in as :name",
 
+    /*
+     * 4.1.0
+     */
+    "merge_users"                   => "Merge Users",
+    "merge_user_into"               => "Select user to merge into",
+    "merge_organisations"           => "Merge Organisations",
+    "merge_organisation_into"       => "Select organisation to merge into",
+    "search_for_organisation"       => "Search for organisation...",
+
+    /*
+     * 4.2.0
+     */
+    "reply_template"                => "Reply Template|Reply Templates",
+    "reply_template_desc"           => "Set a personal reply template that prefills the textarea when starting to compose a reply, with the option to customise based on the brand/department of the ticket. The default reply template is used when a reply template for a specific department and/or brand cannot be found.",
+    "operator_reply_template"       => "Operator Reply Template|Operator Reply Templates",
+    "ticket_reply_template_desc"    => "Set the operator's default ticket reply template.",
+    "operator_reply_template_desc"  => "Further reply templates for specific departments and/or brands can be set in the <a href=':route' target='_blank'>Operator Reply Templates</a> section.",
+
 );

Lang/tr/validation.php

@@ -176,7 +176,7 @@
     /*
      * 3.5.0
      */
-    'phone'                     => "The supplied phone number is invalid.",
+    "phone"                     => "The supplied phone number is invalid.",
 
     /*
     |--------------------------------------------------------------------------