From c9b4f76d634213c1b1e0eaac66c15e2a6c302af0 Mon Sep 17 00:00:00 2001 From: bytestream Date: Thu, 12 May 2022 19:14:57 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20Synchronised=20with=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yml | 2 +- conditions.php | 5 +++ core.php | 91 ++++++++++++++++++++++++++++++++------ general.php | 16 +++++++ license.php | 5 +++ permission.php | 12 ++--- ticket.php | 14 +++--- user.php | 10 +++++ 8 files changed, 126 insertions(+), 29 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 8bab3d8..bfacbdf 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -53,7 +53,7 @@ jobs: GITHUB_RUN_ID: ${{ github.run_id }} - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GH_TOKEN }} base: ${{ matrix.branch }} diff --git a/conditions.php b/conditions.php index b13b261..25df93a 100644 --- a/conditions.php +++ b/conditions.php @@ -107,4 +107,9 @@ * 3.7.0 */ "user_organisation_access_level" => "Toegangsniveau gebruiker binnen organisatie", + + /* + * 4.0.0 + */ + "last_message_content_exc_notes" => "Last message content (excluding notes)", ); diff --git a/core.php b/core.php index b859b2a..7eea45b 100644 --- a/core.php +++ b/core.php @@ -116,7 +116,6 @@ // Plugins "plugins" => "Plugin|Plugins", - "installed_plugins" => "Geïnstalleerde plugins", "visit_plugin" => "Pluginsite bezoeken", // Messages @@ -405,7 +404,6 @@ "heading5" => "Kop 5", "heading6" => "Kop 6", "upload" => "Upload", - "upload_label" => "Sleep bestanden hier of klik om te uploaden", "more_formatting" => "Meer Opmaak", "clearformat" => "Opmaak verwijderen", "bold" => "Vet", @@ -452,15 +450,6 @@ "ticket_desc2" => "Het ticketoverzicht kan geordend worden naar persoonlijke voorkeur en gefilterd worden waar nodig.", "zip_extension_required" => "ZIP PHP-extensie is niet geïnstalleerd. Installeer de extensie en probeer het opnieuw .", "zip_file_not_downloaded" => "ZIP bestand kan niet worden gedownload. Controleer of je toegang hebt tot: :url", - "plugin_basic_info" => "Geef wat basisinformatie over je plugin.", - "plugin_author_name" => "Naam auteur", - "plugin_author_uri" => "Auteur URI (link naar je website)", - "plugin_vendor_name" => "Naam leverancier (naam van je bedrijf, kan hetzelfde zijn als je auteur naam)", - "plugin_name" => "Plugin Naam", - "plugin_description" => "Plugin omschrijving", - "plugin_already_exists" => "Plugin bestaat al!", - "plugin_creating" => "Plugin aanmaken...", - "plugin_ready" => "Plugin staat klaar in :directory!", /* * 3.3.0 @@ -483,9 +472,6 @@ "brand_name_desc" => "De merknaam wordt gebruikt voor alle correspondentie met gebruikers. ", "supportpal_announcements" => "SupportPal Aankondigingen", "add_selectize" => ":item toevoegen...", - "plugin_author_uri_short" => "Auteur URI", - "plugin_vendor_name_short" => "Naam leverancier", - "open_link_in_new_tab" => "Open link in nieuw tabblad", "general_settings" => "Algemene instellingen configureren", "configure_brand" => "Merk configureren", "configure_department" => "Afdeling configureren", @@ -528,4 +514,81 @@ "background_jobs" => "Cronjobs", "background_jobs_not_processing" => "Crons worden momenteel niet verwerkt, bekijk de stappen voor probleemoplossing.", + /* + * 4.0.0 + */ + "addon" => "Add-on|Add-ons", + "addon_already_exists" => "An add-on already exists at this path: :path", + "addons_marketplace" => "Marketplace", + "addons_missing_valid_artifact" => "Add-on does not have a valid archive.", + "checksum_not_matched" => "The downloaded file failed checksum verification.", + "invalid_archive_format" => "Artifact should not include other directories other than the add-on.", + "downloading_version" => "Downloading add-on version :version to :path...", + "extracting_addon" => "Extracting add-on files...", + "activating_addon" => "Activating add-on...", + "addon_install_success" => "Add-on installed successfully.", + "addon_install_error" => "Add-on failed to install, please check the application logs for more details.", + "addon_latest_version" => "Add-on is already running the latest version.", + "addon_update_success" => "Add-on updated successfully.", + "addon_update_error" => "Add-on failed to update and has been reverted, please check the application logs for more details.", + "addon_basic_info" => "Please provide some basic information about the add-on.", + "addon_author_name" => "Author name", + "addon_author_uri" => "Author URI (link to your website)", + "addon_author_uri_short" => "Author URI", + "addon_vendor_name" => "Vendor name (name of your company, can be same as author name)", + "addon_vendor_name_short" => "Vendor Name", + "addon_name" => "Add-on name", + "addon_description" => "Add-on description", + "addon_creating" => "Creating add-on...", + "addon_ready" => "Add-on ready in :directory! Build something amazing.", + "addon_version_not_supported" => "The available version of the add-on does not support the installed SupportPal version.", + "no_addons_found" => "No add-ons found.", + "price" => "Price", + "one_time" => "One Time", + "monthly" => "Monthly", + "quarterly" => "Quarterly", + "semiannually" => "Semi-Annually", + "annually" => "Annually", + "biennially" => "Biennially", + "triennially" => "Triennially", + "tag" => "Tag|Tags", + "login_to_install" => "Login to Install", + "marketplace_login_error" => "Login failed. Please logout and then ensure to log in to the account that has your SupportPal license.", + "payment_required" => "Payment Required", + "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 terms of service.", + "addon_cancel_info" => "Cancelling will immediately deactivate the add-on and stop any further payments being taken.", + "system_health" => "System Health", + "system_health_desc" => "Health checks monitor that the system is performing correctly and notify you when issues arise.", + "system_health_errors" => "One or more system health checks are failing.", + "app_log_check" => "Application Log Error Count", + "app_log_errors_exist" => "Application log file for today contains errors, please check the logs by navigating to Utilities -> Logs -> Log File Manager -> :filename", + "redis_check" => "Redis Connection", + "web_server_check" => "Web Server", + "web_server_error" => "Unable to connect to :url", + "redirection_rules_check" => "Redirection Rules", + "redirection_rule_error" => "Server redirection rules must remove /index.php from path. Otherwise attackers can potentially access your files.", + "cron_check" => "Cron", + "cron_check_error" => "The cron is not running.", + "cron_check_warning" => "The following tasks: (:tasks) has not been ran within their expected interval.", + "database_check" => "Database Connection", + "disk_usage_check" => "Free Disk Space", + "email_queue_check" => "Outbound Email Queue", + "email_queue_warning" => "Email queue contains :number emails that require manual attention.", + "pipe_check" => "Email Piping", + "file_not_found" => "File ':path' not found.", + "file_not_executable" => "File ':path' is not executable.", + "dependency_resolution" => "Unable to run health check.", + "debug_mode_warning" => "Debug mode should only be used temporarily.", + "custom_colour" => "Custom Colour", + "remove_colour" => "Remove Colour", + "background_colour" => "Background Colour", + "open_link" => "Open link", + "open_link_in" => "Open link in...", + "new_window" => "New window", + "current_window" => "Current window", + "edit_image" => "Edit image...", + "alternative_description" => "Alternative description", + "browse_image" => "Browse for an image", + "drop_image" => "Drop an image here", + ); diff --git a/general.php b/general.php index bfbb239..3ba929c 100644 --- a/general.php +++ b/general.php @@ -399,4 +399,20 @@ */ "download_all" => "Download Alles", + /* + * 4.0.0 + */ + "install" => "Install", + "installing" => "Installing...", + "updating" => "Updating...", + "cancelling" => "Cancelling...", + "ok" => "OK", + "mark_as_verified" => "Mark as Verified", + "not_verified" => "Not Verified", + "free" => "Free", + "commercial" => "Commercial", + "purchase" => "Purchase", + "more_information" => "More Information", + "details" => "Details", + ); diff --git a/license.php b/license.php index 710bbe2..8c925e3 100644 --- a/license.php +++ b/license.php @@ -43,4 +43,9 @@ */ "multi_ip_support" => "Overweeg om Multi-IP ondersteuning in het klantpaneel in te schakelen om extra IP-adressen te definiëren.", + /* + * 4.0.0 + */ + "unlicensed" => "Unlicensed", + ); diff --git a/permission.php b/permission.php index 9aa3aff..18a2cea 100644 --- a/permission.php +++ b/permission.php @@ -61,12 +61,6 @@ // General "tag" => "Tags beheren", - /* - * 2.0.2 - */ - // Core - "plugin" => "Plugins beheren", - /* * 2.0.3 */ @@ -125,4 +119,10 @@ */ "background_jobs" => "Crons bekijken", + /* + * 4.0.0 + */ + "addon" => "View and Manage Add-ons", + "system_health" => "View System Health", + ); diff --git a/ticket.php b/ticket.php index f8f2cad..8e954de 100644 --- a/ticket.php +++ b/ticket.php @@ -298,8 +298,6 @@ "track_ticket_not_found" => "Kon het ticket met ticketnummer en e-mailadres van de gebruiker niet vinden", - "channel_deactivated" => "Dit ticketkanaal is momenteel gesloten, een antwoord kan niet gestuurd worden.", - "type_in_tags" => "Type in tags", /* @@ -322,7 +320,6 @@ "default_reply_options_desc" => "Selecteer de standaardantwoordopties die moeten worden ingesteld bij het openen of beantwoorden van een ticket. De optie ': reply_option' wordt aangevinkt op basis van de instelling ': department_option'.", "associate_response_tag" => "Voeg tags toe aan het standaardantwoord...", "canned_response_tags_desc" => "Het toevoegen van tags kunnen helpen bij het vinden van een standaardantwoord bij het beantwoorden van een ticket.", - "loading_tags" => "Tags worden geladen", "append_ip_address" => "IP-adres toevoegen", "append_ip_address_desc" => "Voeg het IP-adres van gebruikers toe aan hun berichten wanneer ze openen en antwoord geven op tickets van de frontend.", "unassign_operator" => "Operator ongedaan maken", @@ -495,11 +492,6 @@ "block_user" => "Gebruiker blokkeren", "merge_tickets" => "Tickets Samenvoegen", - /* - * 2.5.1 - */ - "channel_account_removed" => "Het ticketkanaalaccount is gedeactiveerd of verwijderd, er kan geen reactie worden geplaatst.", - /* * 2.6.0 */ @@ -547,4 +539,10 @@ "api_channel_name" => "API", "api_channel_desc" => "Tickets en antwoorden gepost via de API.", + /* + * 4.0.0 + */ + "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.", + ); diff --git a/user.php b/user.php index b7efa15..23da148 100644 --- a/user.php +++ b/user.php @@ -339,4 +339,14 @@ "logged_in" => "Ingelogd", "revoke_session_desc" => "Als je een sessie intrekt, wordt het apparaat afgemeld.", + /** + * 4.0.0 + */ + "verify_phone_number" => "Verify Phone Number", + "verify_phone_method" => "Select the method you wish to verify your phone number.", + "verify_phone_code_sent" => "A verification code has been sent to your phone number, please enter this code below.", + "verify_phone_code_send_error" => "An error occurred while sending the verification code. Please try again later.", + "verify_phone_code_error" => "Code could not be verified.", + "logged_in_as" => "Logged in as :name", + );