Merge branch 'master' into master

Lang/sv/actions.php

@@ -26,11 +26,7 @@
     /*
      * 2.2.0
      */
-    "increase_due_time"         => "Förläng förfallotiden",
     "close_and_lock_ticket"     => "Stäng och lås ärendet",
-    "pause_due_time"            => "Pausa förfallotiden",
-    "reduce_due_time"           => "Minska förfallotiden",
-    "set_due_time"              => "Sätt förfallotid",
     "unlock_ticket"             => "Lås upp ärendet",
     "update_sla_plan"           => "Uppdatera SLA planen",
     "update_subject"            => "Uppdatera ämnesraden",
@@ -74,8 +70,17 @@
     "block_user"                => "Blockera användare",
 
     /*
-     * 2.6.0
+     * 5.0.0
      */
-    "clear_due_time"            => "Ta bort förfallotid",
+    "increase_resolve_due_time" => "Increase resolution due time",
+    "increase_reply_due_time"   => "Increase reply due time",
+    "reduce_resolve_due_time"   => "Reduce resolution due time",
+    "reduce_reply_due_time"     => "Reduce reply due time",
+    "set_resolve_due_time"      => "Set resolution due time",
+    "set_reply_due_time"        => "Set reply due time",
+    "clear_resolve_due_time"    => "Clear resolution due time",
+    "clear_reply_due_time"      => "Clear reply due time",
+    "pause_due_times"           => "Pause due times",
+    "unpause_due_times"         => "Unpause due times",
 
 );

Lang/sv/conditions.php

@@ -81,11 +81,6 @@
      */
     "last_message_content"              => "Senaste meddelandeinnehåll",
 
-    /*
-     * 2.5.0
-     */
-    "user_email_confirmed"              => "Användarens e-post bekräftad",
-
     /*
      * 3.0.0
      */
@@ -112,4 +107,15 @@
      * 4.0.0
      */
     "last_message_content_exc_notes"    => "Senaste meddelandeinnehåll (ej noteringar)",
+
+    /*
+     * 5.0.0
+     */
+    "user_email_verified"               => "User email verified",
+    "ticket_has_followup"               => "Ticket has follow up",
+
+    /*
+     * 5.3.0
+     */
+    "user_registered"                   => "User registered",
 );

Lang/sv/core.php

@@ -90,7 +90,6 @@
     "smtp_username"             => "SMTP-användarnamn",
     "smtp_password"             => "SMTP-lösenord",
     "ssl"                       => "SSL",
-    "tls"                       => "TLS",
     "email_content"             => "E-postinnehåll",
     "email_content_desc"        => "Skriv in ett standardämne och e-postinnehåll för denna mall. Du kan skriva denna mall i andra språk. Om en mall inte har ett annat språk så kommer den att använda standarddatan.",
     "outgoing"                  => "Utgående",
@@ -174,7 +173,6 @@
     "schedule_task_cron"        => "Cronjobb",
     "schedule_task_3"           => "Skapa ett cronjobb liknande exemplet nedan på din server för att schemalagda aktiviteter ska köras automatiskt.",
     "ticket_channel_desc"       => "Ärendekanaler är metoder för att skapa ärenden. De kan lätt bli utökade att inkludera dina egna kanaler till exempel ärenden öppnade via Instagram.",
-    "ticket_channel_2"          => "Vi tillhandahåller ett antal standardkanaler. Du kan aktivera och konfigurera Facebook- och Twitter-kanalerna att samla ärenden genererade via sociala medier.",
     "user_desc"                 => "Användare som interagerar med ditt system visas här.Du kan lägga till, ändra och ta bort användare som du vill.",
     "organisation_desc"         => "Användare kan bli tilldelade organisationer som ger dem tillgång till ärenden öppnade av andra användare inom sin organisation.",
     "operator_desc"             => "Andra personalmedlemmar kan bli tillagda som operatörer här tillsammans med att hantera vilka avdelningar de tillhör.",
@@ -591,4 +589,98 @@
     "browse_image"              => "Bläddra efter en bild",
     "drop_image"                => "Släpp en bild här",
 
+    /*
+     * 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",
+
+    /*
+     * 4.3.0
+     */
+    "db_connection_error"       => "Database connection error, please check :path",
+
+    /*
+     * 5.0.0
+     */
+    "favicon_dark_mode"         => "Dark Mode Favicon",
+    "favicon_dark_mode_desc"    => "If your favicon was designed to only work on a light background, set a different favicon for dark mode. This will only be used if your browser and/or operating system is running in dark mode.",
+    "template_mode_system_desc" => "Choosing system will synchronise the template mode to light or dark mode depending on your operating system theme settings.",
+
+    /*
+     * 5.0.1
+     */
+    "starttls_or_none"          => "STARTTLS / None",
+
+    /*
+     * 5.1.0
+     */
+    "email_attempt_at_desc"     => "The email failed to send. Retrying again :time.", // :time example, "in 5 mins"
+    "websockets_connection"     => "Web Sockets Connection",
+    "websockets_not_running"    => "Unable to connect to web socket server.",
+    "search_driver_check"       => "Search Driver",
+    "search_driver_not_working" => "The configured search driver is not working correctly.",
+
+    /*
+     * 5.2.0
+     */
+    "temporary_path"            => "Temporary Path",
+    "temporary_path_desc"       => "The temporary path is used to store files during the update. The system temporary path is used by default. The path must have at least 3GB of free space.",
+    "background_jobs_desc"      => "Below are a list of background jobs that have failed recently.",
+    "failed_jobs"               => "Failed Jobs",
+    "horizon_dashboard"         => "Horizon Dashboard",
+    "job"                       => "Job|Jobs",
+    "job_payload"               => "Job Payload",
+    "job_exception"             => "Job Exception",
+    "failed_at"                 => "Failed At",
+    "queue"                     => "Queue",
+    "exception"                 => "Exception",
+    "data"                      => "Data",
+    "failed_background_jobs"    => "One or more <a target='_blank' href=':link'>background jobs</a> have failed and require manual attention.",
+
+    /*
+     * 5.3.0
+     */
+    "ticket_channel_2"          => "Vi tillhandahåller ett antal standardkanaler. Du kan aktivera och konfigurera Facebook- och Twitter-kanalerna att samla ärenden genererade via sociala medier.",
+    "incoming_duplicate"        => "Incoming (Duplicate)",
+
+    /*
+     * 5.4.0
+     */
+    "email_method_overridden"   => "The email method has been overridden in the <a href=':link' target='_blank'>default brand settings</a>.",
+    "addon_not_found"           => "Add-on not found.",
+    "deactivating_addon"        => "Deactivating add-on...",
+    "addon_already_activated"   => "Add-on already activated.",
+    "addon_already_deactivated" => "Add-on already deactivated.",
+    "addon_cannot_deactivate"   => "Add-on cannot be deactivated.",
+    "addon_activation_failed"   => "Add-on activation failed, check the application log for more information.",
+    "addon_deactivation_failed" => "Add-on deactivation failed, check the application log for more information.",
+    "site_key"                  => "Site Key",
+    "secret_key"                => "Secret Key",
+    "turnstile_desc"            => "Please register a new Turnstile widget at <a target='_blank' href=\"https://developers.cloudflare.com/turnstile/get-started/\">Cloudflare</a>. Copy the site and secret key above.",
+    "hcaptcha_desc"             => "Please register at <a target='_blank' href=\"https://hcaptcha.com/\">hCaptcha</a>. Copy the site and secret key above.",
+    "captcha_type_desc"         => "Select the Captcha to be used throughout the system. We recommend switching to Google reCAPTCHA, which requires additional configuration.",
+
 );

Lang/sv/events.php

@@ -20,4 +20,20 @@
     "update_subject"        => "Ämne uppdaterat",
     "update_watching"       => "Bevakande operatörer uppdaterade",
 
+    /*
+     * 5.0.0
+     */
+    "update_custom_field"   => "Custom field updated",
+    "operator_draft"        => "Operator draft updated",
+    "update_cc"             => "CC email addresses updated",
+    "update_due_time"       => "Due time updated",
+    "update_sla_plan"       => "SLA plan updated",
+    "update_locked"         => "Ticket locked",
+    "update_unlocked"       => "Ticket unlocked",
+
+    /*
+     * 5.1.0
+     */
+    "update_message"        => "Message updated",
+
 );

Lang/sv/general.php

@@ -415,4 +415,18 @@
     "more_information"          => "Mer information",
     "details"                   => "Detaljer",
 
+    /*
+     * 4.1.0
+     */
+    "merge"                     => "Merge",
+
+    /*
+     * 5.0.0
+     */
+    "invited"                   => "Invited",
+    "apply"                     => "Apply",
+    "opened"                    => "Opened",
+    "week"                      => "Week|Weeks",
+    "quarter"                   => "Quarter|Quarters",
+
 );

Lang/sv/installer.php

@@ -64,12 +64,6 @@
     "help_desc"                 => "Should you need any help in configuring or using SupportPal, we have two main sources of information:",
     "submit_a_ticket"           => "Submit a Ticket",
 
-    /*
-     * 2.0.1
-     */
-
-    "post_install"              => "For the system to function properly, a cron job must be set-up. Please read our <a href='http://docs.supportpal.com/display/DOCS/New+Installation#NewInstallation-PostInstallationSteps'>post installation steps</a> for details on this and other recommend actions to improve functionality and security.",
-
     /*
      * 2.0.2
      */
@@ -111,15 +105,12 @@
     "allow_url_fopen"           => "'allow_url_fopen' Enabled",
     "allow_url_fopen_failure"   => "Enable 'allow_url_fopen' in your php.ini file to use Gravatar and other features.",
     "allowed_methods"           => "HTTP Allowed Methods",
-    "help_allowed_methods"      => "Your web server must permit all of the below HTTP methods. Please check our <a href='https://docs.supportpal.com/current/New+Installation#PostInstallationSteps' target='_blank'>New Installation</a> documentation for more information.",
 
     /*
      * 2.4.0
      */
     "mysql_server_version"      => "Server Version >= :min",
     "mysql_server_version_desc" => "MySQL :min or greater is required to run SupportPal. Found: ':version'.",
-    "mysql_client_version"      => "Client Version >= :min (:mysqlnd_min for MySQLnd)",
-    "mysql_client_version_desc" => "MySQL client version :min or greater (:mysqlnd_min for MySQLnd) is required to run SupportPal. Found: ':version'.",
 
     "upgrade_step"              => "Step :num of :total: ",
     "accept_eula"               => "Accept EULA",
@@ -134,7 +125,6 @@
      */
     "press_to_begin"            => "Please press the button below to start.",
     "locked"                    => "Install/Upgrade In-Progress",
-    "locked_desc"               => "Detected a lock file (:path).\nPlease check that the installer is not already running.\n\nYou can delete this file when you're certain that another installation or upgrade is not in progress.",
 
     "error_and_empty_database"  => "There was an error. You may need to empty the database before starting again.",
     "login_with_details"        => "You can login using the details specified earlier.",
@@ -192,4 +182,26 @@
      * 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",
+
+    /*
+     * 5.0.0
+     */
+    "mysql_client_version"      => "Client Version >= :min (:mysqlnd_min for MySQLnd)",
+    "mysql_client_version_desc" => "MySQL client version :min or greater (:mysqlnd_min for MySQLnd) is required to run SupportPal. Found: ':version'.",
+    "post_install"              => "For the system to function properly, a cron job must be set-up. Please read our <a href='http://docs.supportpal.com/display/DOCS/New+Installation#NewInstallation-PostInstallationSteps'>post installation steps</a> for details on this and other recommend actions to improve functionality and security.",
+    "help_allowed_methods"      => "Your web server must permit all of the below HTTP methods. Please check our <a href='https://docs.supportpal.com/current/New+Installation#PostInstallationSteps' target='_blank'>New Installation</a> documentation for more information.",
+
+    /*
+     * 5.3.0
+     */
+    "check_file_permissions"    => "Checking file permissions...",
+
 );

Lang/sv/integrations.php

@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+return array(
+
+    /*
+     * 5.0.0
+     */
+    "app_id"                           => "App ID",
+    "app_secret"                       => "App Secret",
+    "api_key"                          => "API Key",
+
+    "algolia_documentation"            => "Please read over our documentation for setting up <a href=':link'>Algolia</a>.",
+
+    "facebook_documentation"           => "Please read over our documentation for setting up <a href=':link'>Facebook</a>.",
+    "facebook_redirect_url"            => "The following URL <strong>must</strong> be entered for the Facebook Login 'Valid OAuth redirect URIs':",
+
+    "google_documentation"             => "Please read over our documentation for setting up <a href=':link'>Google</a>.",
+    "google_redirect_url"              => "The following URL(s) <strong>must</strong> be entered for the Google 'Authorized redirect URIs':",
+
+    "microsoft_documentation"          => "Please read over our documentation for setting up <a href=':link'>Microsoft</a>.",
+    "microsoft_redirect_url"           => "The following URL(s) <strong>must</strong> be entered for the Application 'Redirect URIs':",
+
+    "pusher_hosting"                   => "Hosting",
+    "pusher_cloud"                     => "Cloud (pusher.com)",
+    "pusher_self_hosted"               => "Self-Hosted",
+    "pusher_key"                       => "Key",
+    "pusher_secret"                    => "Secret",
+    "pusher_cluster"                   => "Cluster",
+    "pusher_internal_host"             => "Internal Host",
+    "pusher_internal_host_desc"        => "The internal hostname or IP address of the web socket server.",
+    "pusher_internal_port_desc"        => "The port of the internal web socket server.",
+    "pusher_external_host"             => "External Host",
+    "pusher_external_host_desc"        => "The hostname or IP address of the web socket server that members of the public can access. Please leave blank to default to the hostname of your help desk.",
+    "pusher_external_port_desc"        => "The port of the public web socket server. Please leave blank to default to the same port as your webserver",
+    "pusher_encryption_desc"           => "Enable if you've configured an SSL certificate on the web socket server.",
+    "pusher_unable_to_receive_updates" => "Unable to receive real-time updates. Please check your internet connection.",
+
+    "steam_documentation"              => "Please read over our documentation for setting up <a href=':link'>Steam</a>.",
+
+    "twilio_account_details"           => "Account Details",
+    "twilio_account_details_desc"      => "The account SID and auth token are available on your account console under 'Account Info'.",
+    "twilio_account_sid"               => "Account SID",
+    "twilio_auth_token"                => "Auth Token",
+    "twilio_api_details"               => "API Details",
+    "twilio_api_details_desc"          => "Search for 'API Keys' in the console. Create an API key, and enter the key and secret below.",
+    "twilio_api_secret"                => "API Secret",
+    "twilio_number_verification"       => "Number Verification",
+    "twilio_number_verification_desc"  => "Optional - Enter a verification service SID to enable verification of user phone numbers. This is recommended to avoid a user entering any phone number - the <a target='_blank' href='https://www.twilio.com/verify'>Verify</a> service by Twilio is chargeable.",
+    "twilio_verify_sid"                => "Verification SID",
+
+    "twitter_api_key_secret"           => "API Key Secret",
+
+    /*
+     * 5.3.0
+     */
+    "twitter_documentation"            => "Please read over our documentation for setting up <a href=':link'>X</a>.",
+    "twitter_redirect_url"             => "The following URL <strong>must</strong> be entered for the X App 'Callback URL':",
+
+);