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

Author: github-actions[bot]

.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/da/core.php

@@ -361,7 +361,7 @@
      */
     "enable_ssl_warning"        => "Hvis du aktiverer denne indstilling når siden ikke indlæser korrekt kan du blive låst ude af SupportPal!",
     "verify_frontend_loads"     => "Verificer at frontenden indlæses korrekt herunder.",
-    "twig_operator_signature"   => "{{ operator.signature|raw }} flet feltet vil blive processeret ved runtime da forhåndsvisningen kan være inkorrekt.",
+    "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 efter et billede",
     "drop_image"                => "Drop et billede her",
 
+    /*
+     * 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/da/general.php

@@ -415,4 +415,15 @@
     "more_information"          => "Mere Information",
     "details"                   => "Detaljer",
 
+    /*
+     * 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/da/installer.php

@@ -192,4 +192,13 @@
      * 3.7.0
      */
     "troubleshooting_tips"      => "Få fejlfinding 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/da/log.php

@@ -114,7 +114,6 @@
      */
     "ticket_brand_disabled_reply"       => "Besvarelse kunne ikke blive tilføjet på grund af ticket tilhører et deaktiveret brand #:rel.",
     "personal_signatures_updated"       => "Opdaterede personlig signatur.",
-    "operator_signatures_updated"       => "Opdaterede :rel's signatur.",
     "check_email_failed"                => "Fejl: Fejlede download af email fra konto :old_value: ':rel'.",
     "ticket_added_cc"                   => "Email(s) :new_value tilføjet til CC adresse liste for ticket #:rel.",
     "ticket_removed_cc"                 => "Email(s) :old_value fjernet fra CC adresse liste for ticket #:rel.",
@@ -203,4 +202,15 @@
      */
     "selfservice_article_neutral"       => "Neutralt vurderet artikel :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/da/messages.php

@@ -154,4 +154,10 @@
     "popup_blocked"         => "Din browser blokerer popup vinduer. Aktiver popup vinduer og videresendelser for denne hjemmeside for anvendelse af forhåndsvisning.",
     "error_editing_message" => "Der opstod en fejl i forsøget op at redigere denne besked.",
 
+    /*
+     * 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/da/notification.php

@@ -24,4 +24,10 @@
      */
     "private_message_text"  => ":name har sendt dig en ny <a href=':route'>privat besked</a>.",
 
+    /*
+     * 4.2.0
+     */
+    "new_mention"           => "New Mention",
+    "new_mention_text"      => ":name mentioned you in ticket #<a href=':route'>:number</a>.",
+
 );

Lang/da/permission.php

@@ -77,7 +77,6 @@
     // User
     "usercustomfield"   => "Administrer Brugers Brugerdefinerede Felter",
     "organisationcustomfield" => "Administrer Organisationens Brugerdefinerede Felter",
-    "operatorsignature" => "Administrer Operatør Signaturer",
 
     /*
      * 2.1.1
@@ -125,4 +124,9 @@
     "addon"             => "Vis og Håndter Tilføjelser",
     "system_health"     => "Vis System Helbred",
 
+    /*
+     * 4.2.0
+     */
+    "operatorreplytemplate" => "Manage Operator Reply Templates",
+
 );

Lang/da/ticket.php

@@ -244,7 +244,6 @@
     "ticket_notes_top"          => "Kun i toppen",
     "ticket_notes_messages"     => "Kun i beskeder",
 
-    "captcha_desc"              => "Hvornår skal captcha vises for brugere der åbner nye tickets",
     "unregistered_only"         => "Kun uregistrerede brugere",
 
     "allow_unauth_users"        => "Tillad uautoriserede Brugere",
@@ -276,7 +275,6 @@
     "add_tag"                   => "Tilføj tag",
 
     "unlock"                    => "Lås op",
-    "merge"                     => "Sammenlæg",
     "merged"                    => "Sammenlagt",
     "unmerge"                   => "Opdel",
     "close_and_lock"            => "Luk & Lås",
@@ -454,7 +452,6 @@
     "select_a_department_email" => "Vælg en afdelings email...",
     "record_public_desc"        => "Aktiver for kun at lade :record være tilgængelig for dig selv.",
     "record_group_desc"         => "Hvis du ønsker at lade :record være synlig for udvalgte operatør grouper. Efterlad tom for at gøre synlig for alle operatører.",
-    "ticket_format_desc"        => "Kan indeholde alfanumeriske karakterer og special karakterer <code>-_.+!*,</code><br />De følgende variabler kan også anvendes: %S for et sekventielt nummer | %N for et tilfældigt nummer | %L for et tilfældigt bogstav<br />Brug {number} for gentagelse <strong>kun</strong> efter %N eller %L, eks. %N{4} tilsvarer 4 tilfældige numbre, %L{3} tilsvarer 3 tilfældige bogstaver<br />Det følgende <a href='http://php.net/manual/en/function.date.php' target='_blank'>PHP Date</a> Parameter prefixed med % Y,y,m,d,j,g,G,h,H,i,s",
 
     /*
      * 2.4.0
@@ -545,4 +542,15 @@
     "on_behalf_of"              => "Oprettet på vegne af",
     "reply_canned_be_posted"    => "Det er i øjeblikket ikke muligt at besvare denne ticket; kanalen eller kanal kontoen kan være deaktiveret.",
 
+    /*
+     * 4.1.0
+     */
+    "ticket_format_desc"        => "Kan indeholde alfanumeriske karakterer og special karakterer <code>-_.+!*,</code><br />De følgende variabler kan også anvendes: %S for et sekventielt nummer | %N for et tilfældigt nummer | %L for et tilfældigt bogstav<br />Brug {number} for gentagelse <strong>kun</strong> efter %N eller %L, eks. %N{4} tilsvarer 4 tilfældige numbre, %L{3} tilsvarer 3 tilfældige bogstaver<br />Det følgende <a href='http://php.net/manual/en/function.date.php' target='_blank'>PHP Date</a> Parameter prefixed med % 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"              => "Hvornår skal captcha vises for brugere der åbner nye tickets",
+
 );

Lang/da/user.php

@@ -204,11 +204,6 @@
     "op_settings_individual_dept"   => "Tildeles individuelt:",
     "op_settings_individual_dept_desc" => "Disse afdelinger er en tilføjelse til de afdelinger operatøren er tildelt til via deres grupper ovenfor.",
     "also_registered_other_brand"   => "Brugerne er også registreret i brandet :brands.|Denne bruger er også registreret i følgende brands :brands.",
-    "signature"                     => "Signatur|Signaturer",
-    "signature_desc"                => "Opret personlige ticket signaturer, med mulighed for at tilpasse baseret på en tickets brand eller afdeling. Standard signatures anvendes når en signatur for en specifik afdeling og eller brand ikke kan findes.",
-    "operator_signature"            => "Operatør Signatur|Operatør Signaturer",
-    "ticket_signature_desc"         => "Definer operatørens standard ticket signatur.",
-    "operator_signature_desc"       => "Yderligere signaturer for specifikke afdelinger og eller brands kan defineres i <a href=':route' target='_blank'>Operatør Signaturer</a> sektionen.",
     "view_organisation"             => "Vis Organisation",
     "new_owner"                     => "Ny Ejer",
     "operator_role"                 => "Operatør Rolle|Operatør Roller",
@@ -339,7 +334,7 @@
     "logged_in"                     => "Logget Ind",
     "revoke_session_desc"           => "Fjernelse af en session vil logge enheden ud af operatør panelet. Det vil også fjerne alle Husk Mig tokens for andre enheder.",
 
-    /**
+    /*
      * 4.0.0
      */
     "verify_phone_number"           => "Verificer Telefon Nummer",
@@ -349,4 +344,22 @@
     "verify_phone_code_error"       => "Koden kunne ikke verificeres.",
     "logged_in_as"                  => "Logget ind som :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.",
+
 );