Skip to content
This repository was archived by the owner on Aug 17, 2022. It is now read-only.

Commit c9e8750

Browse files
authored
🔄 Synchronised with master
1 parent c457718 commit c9e8750

File tree

8 files changed

+126
-29
lines changed

8 files changed

+126
-29
lines changed

‎.github/workflows/sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
GITHUB_RUN_ID: ${{ github.run_id }}
5454
5555
- name: Create Pull Request
56-
uses: peter-evans/create-pull-request@v3
56+
uses: peter-evans/create-pull-request@v4
5757
with:
5858
token: ${{ secrets.GH_TOKEN }}
5959
base: ${{ matrix.branch }}

‎conditions.php

+5
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,9 @@
107107
* 3.7.0
108108
*/
109109
"user_organisation_access_level" => "User organisation access level",
110+
111+
/*
112+
* 4.0.0
113+
*/
114+
"last_message_content_exc_notes" => "Last message content (excluding notes)",
110115
);

‎core.php

+77-14
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116

117117
// Plugins
118118
"plugins" => "Insticksmodul|Insticksmoduler",
119-
"installed_plugins" => "Installerade Insticksmodul",
120119
"visit_plugin" => "Besök Insticksmodulsidan",
121120

122121
// Messages
@@ -405,7 +404,6 @@
405404
"heading5" => "Heading 5",
406405
"heading6" => "Heading 6",
407406
"upload" => "Ladda upp",
408-
"upload_label" => "Dra och släpp filer här eller klicka på Ladda upp",
409407
"more_formatting" => "More Formatting",
410408
"clearformat" => "Clear Formatting",
411409
"bold" => "Bold",
@@ -452,15 +450,6 @@
452450
"ticket_desc2" => "The ticket grid can be ordered adjusted to your preference and filtered as needed.",
453451
"zip_extension_required" => "The Zip PHP extension is not installed. Please install it and try again.",
454452
"zip_file_not_downloaded" => "The zip file could not download. Verify that you are able to access: :url",
455-
"plugin_basic_info" => "Please provide some basic information about your plugin.",
456-
"plugin_author_name" => "Author name",
457-
"plugin_author_uri" => "Author URI (link to your website)",
458-
"plugin_vendor_name" => "Vendor name (name of your company, can be same as author name)",
459-
"plugin_name" => "Plugin name",
460-
"plugin_description" => "Plugin description",
461-
"plugin_already_exists" => "Plugin already exists!",
462-
"plugin_creating" => "Creating plugin...",
463-
"plugin_ready" => "Plugin ready in :directory! Build something amazing.",
464453

465454
/*
466455
* 3.3.0
@@ -483,9 +472,6 @@
483472
"brand_name_desc" => "Your brand name is used for all correspondence with users.",
484473
"supportpal_announcements" => "SupportPal Announcements",
485474
"add_selectize" => "Add <strong>:item</strong>...",
486-
"plugin_author_uri_short" => "Author URI",
487-
"plugin_vendor_name_short" => "Vendor Name",
488-
"open_link_in_new_tab" => "Open link in new tab",
489475
"general_settings" => "Configure general settings",
490476
"configure_brand" => "Configure brand",
491477
"configure_department" => "Configure department",
@@ -528,4 +514,81 @@
528514
"background_jobs" => "Background Jobs",
529515
"background_jobs_not_processing" => "Background jobs are not currently being processed, view <a target='_blank' href='https://docs.supportpal.com/current/Background+Jobs#Troubleshooting'>troubleshooting steps</a>.",
530516

517+
/*
518+
* 4.0.0
519+
*/
520+
"addon" => "Add-on|Add-ons",
521+
"addon_already_exists" => "An add-on already exists at this path: :path",
522+
"addons_marketplace" => "Marketplace",
523+
"addons_missing_valid_artifact" => "Add-on does not have a valid archive.",
524+
"checksum_not_matched" => "The downloaded file failed checksum verification.",
525+
"invalid_archive_format" => "Artifact should not include other directories other than the add-on.",
526+
"downloading_version" => "Downloading add-on version :version to :path...",
527+
"extracting_addon" => "Extracting add-on files...",
528+
"activating_addon" => "Activating add-on...",
529+
"addon_install_success" => "Add-on installed successfully.",
530+
"addon_install_error" => "Add-on failed to install, please check the application logs for more details.",
531+
"addon_latest_version" => "Add-on is already running the latest version.",
532+
"addon_update_success" => "Add-on updated successfully.",
533+
"addon_update_error" => "Add-on failed to update and has been reverted, please check the application logs for more details.",
534+
"addon_basic_info" => "Please provide some basic information about the add-on.",
535+
"addon_author_name" => "Author name",
536+
"addon_author_uri" => "Author URI (link to your website)",
537+
"addon_author_uri_short" => "Author URI",
538+
"addon_vendor_name" => "Vendor name (name of your company, can be same as author name)",
539+
"addon_vendor_name_short" => "Vendor Name",
540+
"addon_name" => "Add-on name",
541+
"addon_description" => "Add-on description",
542+
"addon_creating" => "Creating add-on...",
543+
"addon_ready" => "Add-on ready in :directory! Build something amazing.",
544+
"addon_version_not_supported" => "The available version of the add-on does not support the installed SupportPal version.",
545+
"no_addons_found" => "No add-ons found.",
546+
"price" => "Price",
547+
"one_time" => "One Time",
548+
"monthly" => "Monthly",
549+
"quarterly" => "Quarterly",
550+
"semiannually" => "Semi-Annually",
551+
"annually" => "Annually",
552+
"biennially" => "Biennially",
553+
"triennially" => "Triennially",
554+
"tag" => "Tag|Tags",
555+
"login_to_install" => "<a href=':link'>Login</a> to Install",
556+
"marketplace_login_error" => "Login failed. Please <a target='_blank' href='https://www.supportpal.com/manage/logout.php'>logout</a> and then ensure to log in to the account that has your SupportPal license.",
557+
"payment_required" => "Payment Required",
558+
"addon_purchase_info" => "By clicking the above button, your account will be charged the price shown at the selected billing cycle, and you agree to our <a href=':link' target='_blank'>terms of service</a>.",
559+
"addon_cancel_info" => "Cancelling will immediately deactivate the add-on and stop any further payments being taken.",
560+
"system_health" => "System Health",
561+
"system_health_desc" => "Health checks monitor that the system is performing correctly and notify you when issues arise.",
562+
"system_health_errors" => "One or more <a href=':link'>system health</a> checks are failing.",
563+
"app_log_check" => "Application Log Error Count",
564+
"app_log_errors_exist" => "Application log file for today contains errors, please check the logs by navigating to Utilities -> Logs -> Log File Manager -> :filename",
565+
"redis_check" => "Redis Connection",
566+
"web_server_check" => "Web Server",
567+
"web_server_error" => "Unable to connect to :url",
568+
"redirection_rules_check" => "Redirection Rules",
569+
"redirection_rule_error" => "Server redirection rules must remove /index.php from path. Otherwise attackers can potentially access your files.",
570+
"cron_check" => "Cron",
571+
"cron_check_error" => "The cron is not running.",
572+
"cron_check_warning" => "The following tasks: (:tasks) has not been ran within their expected interval.",
573+
"database_check" => "Database Connection",
574+
"disk_usage_check" => "Free Disk Space",
575+
"email_queue_check" => "Outbound Email Queue",
576+
"email_queue_warning" => "Email queue contains :number emails that require manual attention.",
577+
"pipe_check" => "Email Piping",
578+
"file_not_found" => "File ':path' not found.",
579+
"file_not_executable" => "File ':path' is not executable.",
580+
"dependency_resolution" => "Unable to run health check.",
581+
"debug_mode_warning" => "Debug mode should only be used temporarily.",
582+
"custom_colour" => "Custom Colour",
583+
"remove_colour" => "Remove Colour",
584+
"background_colour" => "Background Colour",
585+
"open_link" => "Open link",
586+
"open_link_in" => "Open link in...",
587+
"new_window" => "New window",
588+
"current_window" => "Current window",
589+
"edit_image" => "Edit image...",
590+
"alternative_description" => "Alternative description",
591+
"browse_image" => "Browse for an image",
592+
"drop_image" => "Drop an image here",
593+
531594
);

‎general.php

+16
Original file line numberDiff line numberDiff line change
@@ -399,4 +399,20 @@
399399
*/
400400
"download_all" => "Download All",
401401

402+
/*
403+
* 4.0.0
404+
*/
405+
"install" => "Install",
406+
"installing" => "Installing...",
407+
"updating" => "Updating...",
408+
"cancelling" => "Cancelling...",
409+
"ok" => "OK",
410+
"mark_as_verified" => "Mark as Verified",
411+
"not_verified" => "Not Verified",
412+
"free" => "Free",
413+
"commercial" => "Commercial",
414+
"purchase" => "Purchase",
415+
"more_information" => "More Information",
416+
"details" => "Details",
417+
402418
);

‎license.php

+5
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@
4343
*/
4444
"multi_ip_support" => "Consider enabling <a href=':href' target='_blank'>Multi-IP support</a> in the client area to define additional IP addresses.",
4545

46+
/*
47+
* 4.0.0
48+
*/
49+
"unlicensed" => "Unlicensed",
50+
4651
);

‎permission.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@
6161
// General
6262
"tag" => "Hantera etiketter",
6363

64-
/*
65-
* 2.0.2
66-
*/
67-
// Core
68-
"plugin" => "Visa plugins",
69-
7064
/*
7165
* 2.0.3
7266
*/
@@ -125,4 +119,10 @@
125119
*/
126120
"background_jobs" => "View Background Jobs",
127121

122+
/*
123+
* 4.0.0
124+
*/
125+
"addon" => "View and Manage Add-ons",
126+
"system_health" => "View System Health",
127+
128128
);

‎ticket.php

+6-8
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@
298298

299299
"track_ticket_not_found" => "Kunde inte hitta ärendet med det inskrivna ärendenumret och användare-postadressen.",
300300

301-
"channel_deactivated" => "Ärendekanalen är för närvarande avaktiverad så ett svar kan inte postas.",
302-
303301
"type_in_tags" => "Skriv in taggar",
304302

305303
/*
@@ -322,7 +320,6 @@
322320
"default_reply_options_desc" => "Välj standardsvarsalternativ som sätts när ett ärende öppnas eller besvaras. ':reply_option'-inställningen blir ikryssad baserad på ':department_option'-avdelningsinställningar.",
323321
"associate_response_tag" => "Associera konserverat svar med en etikett...",
324322
"canned_response_tags_desc" => "Lägg till etiketter som kan hjälpa dig att hitta ett snabbsvar när ett ärende besvaras.",
325-
"loading_tags" => "Laddar etiketter",
326323
"append_ip_address" => "Bifoga IP-adress",
327324
"append_ip_address_desc" => "Bifoga användarnas IP-adresser till deras meddelande när de öppnar eller svarar på ärenden från framsidan.",
328325
"unassign_operator" => "Ta bort tilldelad operatör",
@@ -495,11 +492,6 @@
495492
"block_user" => "Block User",
496493
"merge_tickets" => "Merge Tickets",
497494

498-
/*
499-
* 2.5.1
500-
*/
501-
"channel_account_removed" => "The ticket channel account has been deactivated or removed, a reply cannot be posted.",
502-
503495
/*
504496
* 2.6.0
505497
*/
@@ -547,4 +539,10 @@
547539
"api_channel_name" => "API",
548540
"api_channel_desc" => "Tickets and replies posted through the API.",
549541

542+
/*
543+
* 4.0.0
544+
*/
545+
"on_behalf_of" => "Created on behalf of",
546+
"reply_canned_be_posted" => "It is not currently possible to reply to this ticket; the channel or channel account may be disabled.",
547+
550548
);

‎user.php

+10
Original file line numberDiff line numberDiff line change
@@ -339,4 +339,14 @@
339339
"logged_in" => "Logged In",
340340
"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.",
341341

342+
/**
343+
* 4.0.0
344+
*/
345+
"verify_phone_number" => "Verify Phone Number",
346+
"verify_phone_method" => "Select the method you wish to verify your phone number.",
347+
"verify_phone_code_sent" => "A verification code has been sent to your phone number, please enter this code below.",
348+
"verify_phone_code_send_error" => "An error occurred while sending the verification code. Please try again later.",
349+
"verify_phone_code_error" => "Code could not be verified.",
350+
"logged_in_as" => "Logged in as :name",
351+
342352
);

0 commit comments

Comments
 (0)