Skip to content

Commit

Permalink
Version 5.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jshah4517
jshah4517 committed Aug 27, 2024
1 parent 28e6a28 commit 234a18c
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 41 deletions.
18 changes: 17 additions & 1 deletion Lang/en/core.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@
"reprocess_email_desc" => "We recommend to review what originally blocked the email and make any necessary changes before attempting to reprocess.",
"email_blocked_desc" => "The email failed to send several times, it must now be manually sent.",
"captcha_type" => "Captcha Type",
"captcha_type_desc" => "Select the Captcha to be used throughout the system. We recommend switching to Google reCAPTCHA, which requires additional configuration.",
"default_captcha" => "Default Captcha",
"recaptcha_site_key" => "Site Key",
"recaptcha_secret_key" => "Secret Key",
Expand Down Expand Up @@ -666,4 +665,21 @@
"ticket_channel_2" => "We provide a number of default channels, additional channels and other add-ons can be installed from the Add-ons Marketplace.",
"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.",

);
82 changes: 42 additions & 40 deletions Lang/en/locale.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,125 +249,127 @@
"America/Anchorage" => "(GMT-09:00) Alaska",
"America/Los_Angeles" => "(GMT-08:00) Pacific Time (US & Canada)",
"America/Tijuana" => "(GMT-08:00) Tijuana, Baja California",
"America/Denver" => "(GMT-07:00) Mountain Time (US & Canada)",
"America/Phoenix" => "(GMT-07:00) Arizona",
"America/Chihuahua" => "(GMT-07:00) Chihuahua",
"America/Mazatlan" => "(GMT-07:00) Mazatlan",
"America/Phoenix" => "(GMT-07:00) Arizona",
"America/Regina" => "(GMT-06:00) Saskatchewan",
"America/Denver" => "(GMT-07:00) Mountain Time (US & Canada)",
"America/Tegucigalpa" => "(GMT-06:00) Central America",
"America/Chicago" => "(GMT-06:00) Central Time (US & Canada)",
"America/Mexico_City" => "(GMT-06:00) Mexico City",
"America/Monterrey" => "(GMT-06:00) Monterrey",
"America/New_York" => "(GMT-05:00) Eastern Time (US & Canada)",
"America/Regina" => "(GMT-06:00) Saskatchewan",
"America/Bogota" => "(GMT-05:00) Bogota",
"America/New_York" => "(GMT-05:00) Eastern Time (US & Canada)",
"America/Indiana/Indianapolis" => "(GMT-05:00) Indiana (East)",
"America/Lima" => "(GMT-05:00) Lima",
"America/Rio_Branco" => "(GMT-05:00) Rio Branco",
"America/Indiana/Indianapolis" => "(GMT-05:00) Indiana (East)",
"America/Caracas" => "(GMT-04:30) Caracas",
"America/Halifax" => "(GMT-04:00) Atlantic Time (Canada)",
"America/La_Paz" => "(GMT-04:00) La Paz",
"America/Manaus" => "(GMT-04:00) Manaus",
"America/Santiago" => "(GMT-04:00) Santiago",
"America/La_Paz" => "(GMT-04:00) La Paz",
"America/St_Johns" => "(GMT-03:30) Newfoundland",
"America/Argentina/Buenos_Aires" => "(GMT-03:00) Georgetown",
"America/Sao_Paulo" => "(GMT-03:00) Brasilia",
"America/Argentina/Buenos_Aires" => "(GMT-03:00) Buenos Aires",
"America/Godthab" => "(GMT-03:00) Greenland",
"America/Montevideo" => "(GMT-03:00) Montevideo",
"Atlantic/South_Georgia" => "(GMT-02:00) Mid-Atlantic",
"Atlantic/Azores" => "(GMT-01:00) Azores",
"Atlantic/Cape_Verde" => "(GMT-01:00) Cape Verde Is.",
"Africa/Casablanca" => "(GMT) Casablanca",
"Europe/Dublin" => "(GMT) Dublin",
"Europe/Lisbon" => "(GMT) Lisbon",
"Europe/London" => "(GMT) London",
"Africa/Monrovia" => "(GMT) Monrovia",
"Atlantic/Reykjavik" => "(GMT) Reykjavik",
"Africa/Casablanca" => "(GMT) Casablanca",
"Africa/Algiers" => "(GMT+01:00) Algiers",
"Europe/Amsterdam" => "(GMT+01:00) Amsterdam",
"Europe/Belgrade" => "(GMT+01:00) Belgrade",
"Europe/Berlin" => "(GMT+01:00) Berlin",
"Europe/Bratislava" => "(GMT+01:00) Bratislava",
"Europe/Budapest" => "(GMT+01:00) Budapest",
"Europe/Ljubljana" => "(GMT+01:00) Ljubljana",
"Europe/Prague" => "(GMT+01:00) Prague",
"Europe/Sarajevo" => "(GMT+01:00) Sarajevo",
"Europe/Skopje" => "(GMT+01:00) Skopje",
"Europe/Warsaw" => "(GMT+01:00) Warsaw",
"Europe/Zagreb" => "(GMT+01:00) Zagreb",
"Europe/Brussels" => "(GMT+01:00) Brussels",
"Europe/Budapest" => "(GMT+01:00) Budapest",
"Europe/Copenhagen" => "(GMT+01:00) Copenhagen",
"Africa/Lagos" => "(GMT+01:00) Lagos",
"Europe/Ljubljana" => "(GMT+01:00) Ljubljana",
"Europe/Madrid" => "(GMT+01:00) Madrid",
"Europe/Paris" => "(GMT+01:00) Paris",
"Africa/Algiers" => "(GMT+01:00) West Central Africa",
"Europe/Amsterdam" => "(GMT+01:00) Amsterdam",
"Europe/Berlin" => "(GMT+01:00) Berlin",
"Europe/Prague" => "(GMT+01:00) Prague",
"Europe/Rome" => "(GMT+01:00) Rome",
"Europe/Sarajevo" => "(GMT+01:00) Sarajevo",
"Europe/Skopje" => "(GMT+01:00) Skopje",
"Europe/Stockholm" => "(GMT+01:00) Stockholm",
"Europe/Vienna" => "(GMT+01:00) Vienna",
"Europe/Warsaw" => "(GMT+01:00) Warsaw",
"Europe/Zagreb" => "(GMT+01:00) Zagreb",
"Europe/Zurich" => "(GMT+01:00) Zurich",
"Europe/Minsk" => "(GMT+02:00) Minsk",
"Asia/Amman" => "(GMT+02:00) Amman",
"Europe/Athens" => "(GMT+02:00) Athens",
"Asia/Beirut" => "(GMT+02:00) Beirut",
"Europe/Bucharest" => "(GMT+02:00) Bucharest",
"Africa/Cairo" => "(GMT+02:00) Cairo",
"Africa/Harare" => "(GMT+02:00) Harare",
"Europe/Helsinki" => "(GMT+02:00) Helsinki",
"Europe/Istanbul" => "(GMT+02:00) Istanbul",
"Asia/Jerusalem" => "(GMT+02:00) Jerusalem",
"Africa/Johannesburg" => "(GMT+02:00) Johannesburg",
"Europe/Minsk" => "(GMT+02:00) Minsk",
"Europe/Riga" => "(GMT+02:00) Riga",
"Europe/Sofia" => "(GMT+02:00) Sofia",
"Europe/Tallinn" => "(GMT+02:00) Tallinn",
"Europe/Vilnius" => "(GMT+02:00) Vilnius",
"Europe/Athens" => "(GMT+02:00) Athens",
"Europe/Bucharest" => "(GMT+02:00) Bucharest",
"Europe/Istanbul" => "(GMT+02:00) Istanbul",
"Asia/Jerusalem" => "(GMT+02:00) Jerusalem",
"Asia/Amman" => "(GMT+02:00) Amman",
"Asia/Beirut" => "(GMT+02:00) Beirut",
"Africa/Windhoek" => "(GMT+02:00) Windhoek",
"Africa/Harare" => "(GMT+02:00) Harare",
"Asia/Kuwait" => "(GMT+03:00) Kuwait",
"Asia/Riyadh" => "(GMT+03:00) Riyadh",
"Asia/Baghdad" => "(GMT+03:00) Baghdad",
"Asia/Kuwait" => "(GMT+03:00) Kuwait",
"Europe/Moscow" => "(GMT+03:00) Moscow",
"Africa/Nairobi" => "(GMT+03:00) Nairobi",
"Asia/Riyadh" => "(GMT+03:00) Riyadh",
"Asia/Tbilisi" => "(GMT+03:00) Tbilisi",
"Europe/Moscow" => "(GMT+03:00) Moscow",
"Europe/Volgograd" => "(GMT+03:00) Volgograd",
"Asia/Tehran" => "(GMT+03:30) Tehran",
"Asia/Muscat" => "(GMT+04:00) Muscat",
"Asia/Baku" => "(GMT+04:00) Baku",
"Asia/Muscat" => "(GMT+04:00) Muscat",
"Asia/Yerevan" => "(GMT+04:00) Yerevan",
"Asia/Yekaterinburg" => "(GMT+05:00) Ekaterinburg",
"Asia/Karachi" => "(GMT+05:00) Karachi",
"Asia/Tashkent" => "(GMT+05:00) Tashkent",
"Asia/Kolkata" => "(GMT+05:30) Calcutta",
"Asia/Colombo" => "(GMT+05:30) Sri Jayawardenepura",
"Asia/Katmandu" => "(GMT+05:45) Kathmandu",
"Asia/Dhaka" => "(GMT+06:00) Dhaka",
"Asia/Almaty" => "(GMT+06:00) Almaty",
"Asia/Dhaka" => "(GMT+06:00) Dhaka",
"Asia/Novosibirsk" => "(GMT+06:00) Novosibirsk",
"Asia/Rangoon" => "(GMT+06:30) Yangon (Rangoon)",
"Asia/Krasnoyarsk" => "(GMT+07:00) Krasnoyarsk",
"Asia/Bangkok" => "(GMT+07:00) Bangkok",
"Asia/Jakarta" => "(GMT+07:00) Jakarta",
"Asia/Krasnoyarsk" => "(GMT+07:00) Krasnoyarsk",
"Asia/Brunei" => "(GMT+08:00) Beijing",
"Asia/Chongqing" => "(GMT+08:00) Chongqing",
"Asia/Hong_Kong" => "(GMT+08:00) Hong Kong",
"Asia/Urumqi" => "(GMT+08:00) Urumqi",
"Asia/Irkutsk" => "(GMT+08:00) Irkutsk",
"Asia/Ulaanbaatar" => "(GMT+08:00) Ulaan Bataar",
"Asia/Kuala_Lumpur" => "(GMT+08:00) Kuala Lumpur",
"Australia/Perth" => "(GMT+08:00) Perth",
"Asia/Singapore" => "(GMT+08:00) Singapore",
"Asia/Taipei" => "(GMT+08:00) Taipei",
"Australia/Perth" => "(GMT+08:00) Perth",
"Asia/Ulaanbaatar" => "(GMT+08:00) Ulaan Bataar",
"Asia/Urumqi" => "(GMT+08:00) Urumqi",
"Asia/Seoul" => "(GMT+09:00) Seoul",
"Asia/Tokyo" => "(GMT+09:00) Tokyo",
"Asia/Yakutsk" => "(GMT+09:00) Yakutsk",
"Australia/Darwin" => "(GMT+09:30) Darwin",
"Australia/Adelaide" => "(GMT+09:30) Adelaide",
"Australia/Darwin" => "(GMT+09:30) Darwin",
"Australia/Brisbane" => "(GMT+10:00) Brisbane",
"Australia/Canberra" => "(GMT+10:00) Canberra",
"Pacific/Guam" => "(GMT+10:00) Guam",
"Australia/Hobart" => "(GMT+10:00) Hobart",
"Australia/Melbourne" => "(GMT+10:00) Melbourne",
"Australia/Sydney" => "(GMT+10:00) Sydney",
"Australia/Brisbane" => "(GMT+10:00) Brisbane",
"Australia/Hobart" => "(GMT+10:00) Hobart",
"Asia/Vladivostok" => "(GMT+10:00) Vladivostok",
"Pacific/Guam" => "(GMT+10:00) Guam",
"Pacific/Port_Moresby" => "(GMT+10:00) Port Moresby",
"Asia/Magadan" => "(GMT+11:00) Magadan",
"Pacific/Auckland" => "(GMT+12:00) Auckland",
"Pacific/Fiji" => "(GMT+12:00) Fiji",
"Asia/Kamchatka" => "(GMT+12:00) Kamchatka",
"Pacific/Auckland" => "(GMT+12:00) Auckland",
"Pacific/Tongatapu" => "(GMT+13:00) Nukualofa"
),
);
7 changes: 7 additions & 0 deletions Lang/en/log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,4 +260,11 @@
"operator_password_set" => "Set a password for their account.",
"password_reset_sent" => "Reset password link sent to :rel.",

/*
* 5.4.0
*/
"ticket_feedback_rating" => "Rated ticket #:rel as :extra_rel1.", // Rated ticket #123 as 'general.good / general.bad / general.neutral'.
"ticket_feedback_saved" => "Saved :extra_rel1 on ticket #:rel.", // Saved (lowercase ticket.feedback) on ticket #123
"selfservice_feedback_saved" => "Saved :extra_rel1 on article :rel.", // Saved (lowercase ticket.feedback) on article 'Foo bar'

);
Binary file modified Views/assets/img/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 234a18c

Please sign in to comment.