Merge branch 'development' into release

2022-05-09 16:09:54 +01:00 · 2022-05-09 16:09:54 +01:00 · 57b10f195e
parent b1e95eb39f 3a8a476906
commit 57b10f195e
55 changed files with 321 additions and 250 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,9 +1,13 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Discord chat support
+  - name: Discord Chat Support
    url: https://discord.gg/ztkBqR2
-    about: Realtime support / chat with the community and the team.
+    about: Realtime support & chat with the BookStack community and the team.

  - name: Debugging & Common Issues
    url: https://www.bookstackapp.com/docs/admin/debugging/
-    about: Find details on how to debug issues and view common issues with thier resolutions.
+    about: Find details on how to debug issues and view common issues with their resolutions.
+
+  - name: Official Support Plans
+    url: https://www.bookstackapp.com/support/
+    about: View our official support plans that offer assured support for business.
--- a/.github/translators.txt
+++ b/.github/translators.txt
@ -242,3 +242,4 @@ sgenc :: Turkish
 Shukrullo (vodiylik) :: Uzbek
 William W. (Nevnt) :: Chinese Traditional
 eamaro :: Portuguese
+Ypsilon-dev :: Arabic
--- a/app/Entities/Tools/SearchRunner.php
+++ b/app/Entities/Tools/SearchRunner.php
@ -360,7 +360,7 @@ class SearchRunner
                    /** @var Connection $connection */
                    $connection = $query->getConnection();
                    $tagValue = (float) trim($connection->getPdo()->quote($tagValue), "'");
-                    $query->whereRaw("value ${tagOperator} ${tagValue}");
+                    $query->whereRaw("value {$tagOperator} {$tagValue}");
                } else {
                    $query->where('value', $tagOperator, $tagValue);
                }
--- a/app/Exceptions/JsonDebugException.php
+++ b/app/Exceptions/JsonDebugException.php
@ -19,10 +19,13 @@ class JsonDebugException extends Exception
    }

    /**
-     * Covert this exception into a response.
+     * Convert this exception into a response.
+     * We add a manual data conversion to UTF8 to ensure any binary data is presentable as a JSON string.
     */
    public function render(): JsonResponse
    {
-        return response()->json($this->data);
+        $cleaned = mb_convert_encoding($this->data, 'UTF-8');
+
+        return response()->json($cleaned);
    }
 }
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@ -127,9 +127,11 @@ abstract class Controller extends BaseController
    protected function streamedDownloadResponse($stream, string $fileName): StreamedResponse
    {
        return response()->stream(function () use ($stream) {
-            // End & flush the output buffer otherwise we still seem to use memory.
+
+            // End & flush the output buffer, if we're in one, otherwise we still use memory.
+            // Output buffer may or may not exist depending on PHP `output_buffering` setting.
            // Ignore in testing since output buffers are used to gather a response.
-            if (!app()->runningUnitTests()) {
+            if (!empty(ob_get_status()) && !app()->runningUnitTests()) {
                ob_end_clean();
            }

--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@ -83,7 +83,7 @@ class SettingController extends Controller
        $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
        $this->showSuccessNotification(trans('settings.settings_save_success'));

-        return redirect("/settings/${category}");
+        return redirect("/settings/{$category}");
    }

    protected function ensureCategoryExists(string $category): void
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@ -11,7 +11,7 @@ class Localization
    /**
     * Array of right-to-left locales.
     */
-    protected $rtlLocales = ['ar', 'he'];
+    protected $rtlLocales = ['ar', 'fa', 'he'];

    /**
     * Map of BookStack locale names to best-estimate system locale names.
@ -30,6 +30,7 @@ class Localization
        'es_AR'       => 'es_AR',
        'et'          => 'et_EE',
        'eu'          => 'eu_ES',
+        'fa'          => 'fa_IR',
        'fr'          => 'fr_FR',
        'he'          => 'he_IL',
        'hr'          => 'hr_HR',
--- a/composer.lock
+++ b/composer.lock
@ -58,16 +58,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.222.1",
+            "version": "3.222.7",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "632621d97180e82d3adc1245a7b272774c30dbf5"
+                "reference": "03d35eef5c509798d2c08587cfd9a7c33afe2260"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/632621d97180e82d3adc1245a7b272774c30dbf5",
-                "reference": "632621d97180e82d3adc1245a7b272774c30dbf5",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/03d35eef5c509798d2c08587cfd9a7c33afe2260",
+                "reference": "03d35eef5c509798d2c08587cfd9a7c33afe2260",
                "shasum": ""
            },
            "require": {
@ -143,9 +143,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.222.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.222.7"
            },
-            "time": "2022-04-28T18:17:24+00:00"
+            "time": "2022-05-06T18:16:59+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@ -563,22 +563,22 @@
        },
        {
            "name": "doctrine/dbal",
-            "version": "3.3.5",
+            "version": "3.3.6",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "719663b15983278227669c8595151586a2ff3327"
+                "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/719663b15983278227669c8595151586a2ff3327",
-                "reference": "719663b15983278227669c8595151586a2ff3327",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
+                "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
                "shasum": ""
            },
            "require": {
                "composer-runtime-api": "^2",
                "doctrine/cache": "^1.11|^2.0",
-                "doctrine/deprecations": "^0.5.3",
+                "doctrine/deprecations": "^0.5.3|^1",
                "doctrine/event-manager": "^1.0",
                "php": "^7.3 || ^8.0",
                "psr/cache": "^1|^2|^3",
@ -586,15 +586,15 @@
            },
            "require-dev": {
                "doctrine/coding-standard": "9.0.0",
-                "jetbrains/phpstorm-stubs": "2021.1",
-                "phpstan/phpstan": "1.5.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "9.5.16",
+                "jetbrains/phpstorm-stubs": "2022.1",
+                "phpstan/phpstan": "1.6.3",
+                "phpstan/phpstan-strict-rules": "^1.2",
+                "phpunit/phpunit": "9.5.20",
                "psalm/plugin-phpunit": "0.16.1",
                "squizlabs/php_codesniffer": "3.6.2",
                "symfony/cache": "^5.2|^6.0",
                "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
-                "vimeo/psalm": "4.22.0"
+                "vimeo/psalm": "4.23.0"
            },
            "suggest": {
                "symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -654,7 +654,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.3.5"
+                "source": "https://github.com/doctrine/dbal/tree/3.3.6"
            },
            "funding": [
                {
@ -670,29 +670,29 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-05T09:50:18+00:00"
+            "time": "2022-05-02T17:21:01+00:00"
        },
        {
            "name": "doctrine/deprecations",
-            "version": "v0.5.3",
+            "version": "v1.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314"
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314",
-                "reference": "9504165960a1f83cc1480e2be1dd0a0478561314",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
                "shasum": ""
            },
            "require": {
                "php": "^7.1|^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^6.0|^7.0|^8.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0",
-                "psr/log": "^1.0"
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5|^8.5|^9.5",
+                "psr/log": "^1|^2|^3"
            },
            "suggest": {
                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@ -711,9 +711,9 @@
            "homepage": "https://www.doctrine-project.org/",
            "support": {
                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v0.5.3"
+                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
            },
-            "time": "2021-03-21T12:59:47+00:00"
+            "time": "2022-05-02T15:47:09+00:00"
        },
        {
            "name": "doctrine/event-manager",
@ -1790,16 +1790,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v8.83.10",
+            "version": "v8.83.11",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "148ae59b7da6c3db6736374d357c5aaef9506fb7"
+                "reference": "d85c34179f209977043502441f9e44ca432a14b4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/148ae59b7da6c3db6736374d357c5aaef9506fb7",
-                "reference": "148ae59b7da6c3db6736374d357c5aaef9506fb7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/d85c34179f209977043502441f9e44ca432a14b4",
+                "reference": "d85c34179f209977043502441f9e44ca432a14b4",
                "shasum": ""
            },
            "require": {
@ -1959,7 +1959,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-04-27T14:07:37+00:00"
+            "time": "2022-05-03T14:47:00+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@ -2909,16 +2909,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.57.0",
+            "version": "2.58.0",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4a54375c21eea4811dbd1149fe6b246517554e78"
+                "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a54375c21eea4811dbd1149fe6b246517554e78",
-                "reference": "4a54375c21eea4811dbd1149fe6b246517554e78",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055",
+                "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055",
                "shasum": ""
            },
            "require": {
@ -2936,7 +2936,8 @@
                "phpmd/phpmd": "^2.9",
                "phpstan/extension-installer": "^1.0",
                "phpstan/phpstan": "^0.12.54 || ^1.0",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.14",
+                "phpunit/php-file-iterator": "^2.0.5",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23",
                "squizlabs/php_codesniffer": "^3.4"
            },
            "bin": [
@ -3001,7 +3002,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-13T18:13:33+00:00"
+            "time": "2022-04-25T19:31:17+00:00"
        },
        {
            "name": "nikic/php-parser",
@ -4095,16 +4096,16 @@
        },
        {
            "name": "psy/psysh",
-            "version": "v0.11.2",
+            "version": "v0.11.4",
            "source": {
                "type": "git",
                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514"
+                "reference": "05c544b339b112226ad14803e1e5b09a61957454"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514",
-                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454",
+                "reference": "05c544b339b112226ad14803e1e5b09a61957454",
                "shasum": ""
            },
            "require": {
@ -4119,15 +4120,13 @@
                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
            },
            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.2",
-                "hoa/console": "3.17.05.02"
+                "bamarni/composer-bin-plugin": "^1.2"
            },
            "suggest": {
                "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
                "ext-pdo-sqlite": "The doc command requires SQLite to work.",
                "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
-                "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit."
+                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
            },
            "bin": [
                "bin/psysh"
@ -4167,9 +4166,9 @@
            ],
            "support": {
                "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.2"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.4"
            },
-            "time": "2022-02-28T15:28:54+00:00"
+            "time": "2022-05-06T12:49:14+00:00"
        },
        {
            "name": "ralouphie/getallheaders",
@ -9005,16 +9004,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.6.3",
+            "version": "1.6.7",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "6128620b98292e0b69ea6d799871d77163681c8e"
+                "reference": "d41c39cb2e487663bce9bbd97c660e244b73abad"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6128620b98292e0b69ea6d799871d77163681c8e",
-                "reference": "6128620b98292e0b69ea6d799871d77163681c8e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d41c39cb2e487663bce9bbd97c660e244b73abad",
+                "reference": "d41c39cb2e487663bce9bbd97c660e244b73abad",
                "shasum": ""
            },
            "require": {
@ -9040,7 +9039,7 @@
            "description": "PHPStan - PHP Static Analysis Tool",
            "support": {
                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.6.3"
+                "source": "https://github.com/phpstan/phpstan/tree/1.6.7"
            },
            "funding": [
                {
@ -9060,7 +9059,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-28T11:27:53+00:00"
+            "time": "2022-05-04T22:55:41+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
--- a/resources/lang/ar/activities.php
+++ b/resources/lang/ar/activities.php
@ -7,61 +7,61 @@ return [

    // Pages
    'page_create'                 => 'تم إنشاء صفحة',
-    'page_create_notification'    => 'Page successfully created',
+    'page_create_notification'    => 'تم إنشاء الصفحة بنجاح',
    'page_update'                 => 'تم تحديث الصفحة',
-    'page_update_notification'    => 'Page successfully updated',
+    'page_update_notification'    => 'تم تحديث الصفحة بنجاح',
    'page_delete'                 => 'تم حذف الصفحة',
-    'page_delete_notification'    => 'Page successfully deleted',
+    'page_delete_notification'    => 'تم حذف الصفحة بنجاح',
    'page_restore'                => 'تمت استعادة الصفحة',
-    'page_restore_notification'   => 'Page successfully restored',
+    'page_restore_notification'   => 'تمت استعادة الصفحة بنجاح',
    'page_move'                   => 'تم نقل الصفحة',

    // Chapters
    'chapter_create'              => 'تم إنشاء فصل',
-    'chapter_create_notification' => 'Chapter successfully created',
+    'chapter_create_notification' => 'تم إنشاء الفصل بنجاح',
    'chapter_update'              => 'تم تحديث الفصل',
-    'chapter_update_notification' => 'Chapter successfully updated',
+    'chapter_update_notification' => 'تم تحديث الفصل بنجاح',
    'chapter_delete'              => 'تم حذف الفصل',
-    'chapter_delete_notification' => 'Chapter successfully deleted',
+    'chapter_delete_notification' => 'تم حذف الفصل بنجاح',
    'chapter_move'                => 'تم نقل الفصل',

    // Books
    'book_create'                 => 'تم إنشاء كتاب',
-    'book_create_notification'    => 'Book successfully created',
+    'book_create_notification'    => 'تم إنشاء الكتاب بنجاح',
    'book_update'                 => 'تم تحديث الكتاب',
-    'book_update_notification'    => 'Book successfully updated',
+    'book_update_notification'    => 'تم تحديث الكتاب بنجاح',
    'book_delete'                 => 'تم حذف الكتاب',
-    'book_delete_notification'    => 'Book successfully deleted',
+    'book_delete_notification'    => 'تم حذف الكتاب بنجاح',
    'book_sort'                   => 'تم سرد الكتاب',
-    'book_sort_notification'      => 'Book successfully re-sorted',
+    'book_sort_notification'      => 'تم إعادة فرز الكتاب بنجاح',

    // Bookshelves
-    'bookshelf_create'            => 'created bookshelf',
-    'bookshelf_create_notification'    => 'Bookshelf successfully created',
+    'bookshelf_create'            => 'تم إنشاء رف كتب',
+    'bookshelf_create_notification'    => 'تم إنشاء الرف بنجاح',
    'bookshelf_update'                 => 'تم تحديث الرف',
-    'bookshelf_update_notification'    => 'Bookshelf successfully updated',
+    'bookshelf_update_notification'    => 'تم تحديث الرف بنجاح',
    'bookshelf_delete'                 => 'تم تحديث الرف',
-    'bookshelf_delete_notification'    => 'Bookshelf successfully deleted',
+    'bookshelf_delete_notification'    => 'تم حذف الرف بنجاح',

    // Favourites
-    'favourite_add_notification' => '":name" has been added to your favourites',
-    'favourite_remove_notification' => '":name" has been removed from your favourites',
+    'favourite_add_notification' => 'تم إضافة ":name" إلى المفضلة لديك',
+    'favourite_remove_notification' => 'تم إزالة ":name" من المفضلة لديك',

    // MFA
-    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
-    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+    'mfa_setup_method_notification' => 'تم تكوين طريقة متعددة العوامل بنجاح',
+    'mfa_remove_method_notification' => 'تمت إزالة طريقة متعددة العوامل بنجاح',

    // Webhooks
-    'webhook_create' => 'created webhook',
-    'webhook_create_notification' => 'Webhook successfully created',
-    'webhook_update' => 'updated webhook',
-    'webhook_update_notification' => 'Webhook successfully updated',
-    'webhook_delete' => 'deleted webhook',
-    'webhook_delete_notification' => 'Webhook successfully deleted',
+    'webhook_create' => 'تم إنشاء webhook',
+    'webhook_create_notification' => 'تم إنشاء Webhook بنجاح',
+    'webhook_update' => 'تم تحديث webhook',
+    'webhook_update_notification' => 'تم تحديث Webhook بنجاح',
+    'webhook_delete' => 'حذف webhook',
+    'webhook_delete_notification' => 'تم حذف Webhook بنجاح',

    // Users
-    'user_update_notification' => 'User successfully updated',
-    'user_delete_notification' => 'User successfully removed',
+    'user_update_notification' => 'تم تحديث المستخدم بنجاح',
+    'user_delete_notification' => 'تم إزالة المستخدم بنجاح',

    // Other
    'commented_on'                => 'تم التعليق',
--- a/resources/lang/ar/settings.php
+++ b/resources/lang/ar/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/bg/settings.php
+++ b/resources/lang/bg/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/bs/settings.php
+++ b/resources/lang/bs/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/ca/settings.php
+++ b/resources/lang/ca/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/cs/settings.php
+++ b/resources/lang/cs/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/da/settings.php
+++ b/resources/lang/da/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'Hebraisk',
        'hr' => 'Hrvatski',
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@ -282,6 +282,7 @@ Hinweis: Benutzer können ihre E-Mail Adresse nach erfolgreicher Registrierung
        'es_AR' => 'Spanisch Argentinisch',
        'et' => 'Estnisch',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Französisch',
        'he' => 'Hebräisch',
        'hr' => 'Kroatisch',
--- a/resources/lang/de_informal/settings.php
+++ b/resources/lang/de_informal/settings.php
@ -282,6 +282,7 @@ Hinweis: Benutzer können ihre E-Mail Adresse nach erfolgreicher Registrierung
        'es_AR' => 'Spanisch Argentinisch',
        'et' => 'Estnisch',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Französisch',
        'he' => 'עברית',
        'hr' => 'Kroatisch',
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/es/settings.php
+++ b/resources/lang/es/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Francés',
        'he' => 'עברית',
        'hr' => 'Croata',
--- a/resources/lang/es_AR/settings.php
+++ b/resources/lang/es_AR/settings.php
@ -280,6 +280,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Francés',
        'he' => 'עברית',
        'hr' => 'Croata',
--- a/resources/lang/et/settings.php
+++ b/resources/lang/et/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina (Argentiina hispaania keel)',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français (prantsuse keel)',
        'he' => 'עברית (heebrea keel)',
        'hr' => 'Hrvatski (horvaadi keel)',
--- a/resources/lang/eu/settings.php
+++ b/resources/lang/eu/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/fa/settings.php
+++ b/resources/lang/fa/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/fr/settings.php
+++ b/resources/lang/fr/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Espagnol (Argentine)',
        'et' => 'Estonien',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'Hébreu',
        'hr' => 'Croate',
--- a/resources/lang/he/settings.php
+++ b/resources/lang/he/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/hr/settings.php
+++ b/resources/lang/hr/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/hu/settings.php
+++ b/resources/lang/hu/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/id/settings.php
+++ b/resources/lang/id/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/it/settings.php
+++ b/resources/lang/it/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Spagnolo d\'Argentina',
        'et' => 'Estone',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Francese',
        'he' => 'Ebraico',
        'hr' => 'Croato',
--- a/resources/lang/ja/settings.php
+++ b/resources/lang/ja/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/ko/settings.php
+++ b/resources/lang/ko/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => '히브리어',
        'hr' => 'Hrvatski',
--- a/resources/lang/lt/settings.php
+++ b/resources/lang/lt/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/lv/editor.php
+++ b/resources/lang/lv/editor.php
@ -7,164 +7,164 @@
 */
 return [
    // General editor terms
-    'general' => 'General',
-    'advanced' => 'Advanced',
-    'none' => 'None',
+    'general' => 'Vispārīgi',
+    'advanced' => 'Papildu iespējas',
+    'none' => 'Neviens',
    'cancel' => 'Atcelt',
    'save' => 'Saglabāt',
    'close' => 'Aizvērt',
-    'undo' => 'Undo',
-    'redo' => 'Redo',
-    'left' => 'Left',
-    'center' => 'Center',
-    'right' => 'Right',
-    'top' => 'Top',
-    'middle' => 'Middle',
-    'bottom' => 'Bottom',
+    'undo' => 'Atsaukt',
+    'redo' => 'Atcelt atsaukšanu',
+    'left' => 'Pa kreisi',
+    'center' => 'Centrā',
+    'right' => 'Pa labi',
+    'top' => 'Augšā',
+    'middle' => 'Vidū',
+    'bottom' => 'Apakšā',
    'width' => 'Platums',
    'height' => 'Augstums',
    'More' => 'Vairāk',
-    'select' => 'Select...',
+    'select' => 'Atlasīt...',

    // Toolbar
    'formats' => 'Formāti',
-    'header_large' => 'Large Header',
-    'header_medium' => 'Medium Header',
-    'header_small' => 'Small Header',
-    'header_tiny' => 'Tiny Header',
+    'header_large' => 'Liels virsraksts',
+    'header_medium' => 'Vidējs virsraksts',
+    'header_small' => 'Mazs virsraksts',
+    'header_tiny' => 'Ļoti mazs virsraksts',
    'paragraph' => 'Rindkopa',
-    'blockquote' => 'Blockquote',
-    'inline_code' => 'Inline code',
+    'blockquote' => 'Citāts',
+    'inline_code' => 'Kods iekļauts rindā',
    'callouts' => 'Norādes',
    'callout_information' => 'Informācija',
-    'callout_success' => 'Success',
+    'callout_success' => 'Veiksmīgi',
    'callout_warning' => 'Brīdinājums',
-    'callout_danger' => 'Danger',
-    'bold' => 'Bold',
-    'italic' => 'Italic',
-    'underline' => 'Underline',
-    'strikethrough' => 'Strikethrough',
-    'superscript' => 'Superscript',
-    'subscript' => 'Subscript',
+    'callout_danger' => 'Bīstami',
+    'bold' => 'Treknraksts',
+    'italic' => 'Slīpraksts',
+    'underline' => 'Pasvītrojums',
+    'strikethrough' => 'Pārsvītrojums',
+    'superscript' => 'Augšraksts',
+    'subscript' => 'Apakšraksts',
    'text_color' => 'Teksta krāsa',
-    'custom_color' => 'Custom color',
-    'remove_color' => 'Remove color',
+    'custom_color' => 'Pielāgot krāsu',
+    'remove_color' => 'Noņemt krāsu',
    'background_color' => 'Fona krāsa',
-    'align_left' => 'Align left',
-    'align_center' => 'Align center',
-    'align_right' => 'Align right',
-    'align_justify' => 'Justify',
-    'list_bullet' => 'Bullet list',
+    'align_left' => 'Līdzināt pa kreisi',
+    'align_center' => 'Līdzināt pa vidu',
+    'align_right' => 'Līdzināt pa labi',
+    'align_justify' => 'Līdzināt gar abām malām',
+    'list_bullet' => 'Nenumurēts saraksts',
    'list_numbered' => 'Numurēts saraksts',
-    'list_task' => 'Task list',
+    'list_task' => 'Uzdevumu saraksts',
    'indent_increase' => 'Palielināt atkāpi',
    'indent_decrease' => 'Samazināt atkāpi',
    'table' => 'Tabula',
    'insert_image' => 'Ievietot attēlu',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Insert code block',
-    'insert_drawing' => 'Insert/edit drawing',
-    'drawing_manager' => 'Drawing manager',
-    'insert_media' => 'Insert/edit media',
-    'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'insert_image_title' => 'Ievietot/rediģēt attēlu',
+    'insert_link' => 'Ievietot/rediģēt saiti',
+    'insert_link_title' => 'Ievietot/rediģēt saiti',
+    'insert_horizontal_line' => 'Ievietot horizontālu līniju',
+    'insert_code_block' => 'Ievietot koda bloku',
+    'insert_drawing' => 'Ievietot/rediģēt zīmējumu',
+    'drawing_manager' => 'Zīmēšanas pārvaldnieks',
+    'insert_media' => 'Ievietot/rediģēt mediju',
+    'insert_media_title' => 'Ievietot/rediģēt mediju',
+    'clear_formatting' => 'Notīrīt noformējumu',
+    'source_code' => 'Pirmkods',
+    'source_code_title' => 'Pirmkods',
+    'fullscreen' => 'Pilnekrāns',
+    'image_options' => 'Attēla uzstādījumu',

    // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
+    'table_properties' => 'Tabulas īpašības',
+    'table_properties_title' => 'Tabulas īpašības',
+    'delete_table' => 'Dzēst tabulu',
+    'insert_row_before' => 'Ievietot rindu augstāk',
+    'insert_row_after' => 'Ievietot rindu zemāk',
+    'delete_row' => 'Dzēst rindu',
+    'insert_column_before' => 'Ievietot kolonnu pirms',
+    'insert_column_after' => 'Ievietot kolonnu pēc',
+    'delete_column' => 'Dzēst kolonnu',
    'table_cell' => 'Šūna',
    'table_row' => 'Rinda',
    'table_column' => 'Kolonna',
-    'cell_properties' => 'Cell properties',
-    'cell_properties_title' => 'Cell Properties',
-    'cell_type' => 'Cell type',
+    'cell_properties' => 'Šūnas īpašības',
+    'cell_properties_title' => 'Šūnas īpašības',
+    'cell_type' => 'Šūnas tips',
    'cell_type_cell' => 'Šūna',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
-    'table_row_group' => 'Row Group',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
-    'border_style' => 'Border style',
-    'border_color' => 'Border color',
-    'row_properties' => 'Row properties',
-    'row_properties_title' => 'Row Properties',
-    'cut_row' => 'Cut row',
-    'copy_row' => 'Copy row',
-    'paste_row_before' => 'Paste row before',
-    'paste_row_after' => 'Paste row after',
-    'row_type' => 'Row type',
-    'row_type_header' => 'Header',
-    'row_type_body' => 'Body',
-    'row_type_footer' => 'Footer',
-    'alignment' => 'Alignment',
-    'cut_column' => 'Cut column',
-    'copy_column' => 'Copy column',
-    'paste_column_before' => 'Paste column before',
-    'paste_column_after' => 'Paste column after',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
-    'caption' => 'Caption',
-    'show_caption' => 'Show caption',
-    'constrain' => 'Constrain proportions',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'cell_scope' => 'Darbības lauks',
+    'cell_type_header' => 'Galvenes šūna',
+    'merge_cells' => 'Sapludināt šūnas',
+    'split_cell' => 'Sadalīt šūnas',
+    'table_row_group' => 'Rindu grupa',
+    'table_column_group' => 'Kolonnu grupa',
+    'horizontal_align' => 'Horizontāls novietojums',
+    'vertical_align' => 'Vertikāls novietojums',
+    'border_width' => 'Apmales platums',
+    'border_style' => 'Apmales veids',
+    'border_color' => 'Apmales krāsa',
+    'row_properties' => 'Rindas īpašības',
+    'row_properties_title' => 'Rindas īpašības',
+    'cut_row' => 'Izgriezt rindu',
+    'copy_row' => 'Kopēt rindu',
+    'paste_row_before' => 'Ielīmēt rindu augstāk',
+    'paste_row_after' => 'Ielīmēt rindu zemāk',
+    'row_type' => 'Rindas tips',
+    'row_type_header' => 'Galvene',
+    'row_type_body' => 'Pamata saturs',
+    'row_type_footer' => 'Kājene',
+    'alignment' => 'Līdzināšana',
+    'cut_column' => 'Izgriezt kolonnu',
+    'copy_column' => 'Kopēt kolonnu',
+    'paste_column_before' => 'Ielīmēt kolonnu pirms',
+    'paste_column_after' => 'Ielīmēt kolonnu pēc',
+    'cell_padding' => 'Šūnu iekšējais attālums',
+    'cell_spacing' => 'Šūnu attālums',
+    'caption' => 'Virsraksts',
+    'show_caption' => 'Parādīt virsrakstu',
+    'constrain' => 'Saglabāt proporcijas',
+    'cell_border_solid' => 'Pilna',
+    'cell_border_dotted' => 'Punktēta',
+    'cell_border_dashed' => 'Raustīta līnija',
+    'cell_border_double' => 'Dubulta',
+    'cell_border_groove' => 'Iedoba',
+    'cell_border_ridge' => 'Izcelta',
+    'cell_border_inset' => 'Iespiesta',
+    'cell_border_outset' => 'Pacelta',
+    'cell_border_none' => 'Nekas',
+    'cell_border_hidden' => 'Paslēpts',

    // Images, links, details/summary & embed
-    'source' => 'Source',
-    'alt_desc' => 'Alternative description',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
+    'source' => 'Avots',
+    'alt_desc' => 'Alternatīvais apraksts',
+    'embed' => 'Iekļaut',
+    'paste_embed' => 'Iekopējiet savu iekļaušanas kodu zemāk:',
    'url' => 'URL',
-    'text_to_display' => 'Text to display',
+    'text_to_display' => 'Attēlojamais teksts',
    'title' => 'Nosaukums',
-    'open_link' => 'Open link in...',
-    'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'open_link' => 'Atvērt saiti...',
+    'open_link_current' => 'Šis logs',
+    'open_link_new' => 'Jauns logs',
+    'insert_collapsible' => 'Ievietot sakļaujamu bloku',
+    'collapsible_unwrap' => 'Attīt',
+    'edit_label' => 'Rediģēt marķējumu',
+    'toggle_open_closed' => 'Pārslēgt atvērts/aizvērts',
+    'collapsible_edit' => 'Rediģēt sakļaujamu bloku',
+    'toggle_label' => 'Pārslēgt marķējumu',

    // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under an LGPL v2.1 license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
+    'about' => 'Par redaktoru',
+    'about_title' => 'Par WYSIWYG redaktoru',
+    'editor_license' => 'Redaktora licence un autortiesības',
+    'editor_tiny_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar LGPL v2.1 licenci.',
+    'editor_tiny_license_link' => 'TinyMCE autortiesības un licences detaļas var atrast šeit.',
+    'save_continue' => 'Saglabāt lapu un turpināt',
+    'callouts_cycle' => '(Turpiniet spiest, lai pārslēgtu tipus)',
+    'link_selector' => 'Saite uz saturu',
    'shortcuts' => 'Saīsnes',
    'shortcut' => 'Saīsne',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'shortcuts_intro' => 'Šajā redaktorā pieejamas šādas saīsnes:',
    'windows_linux' => '(Windows/Linux)',
    'mac' => '(Mac)',
    'description' => 'Apraksts',
--- a/resources/lang/lv/entities.php
+++ b/resources/lang/lv/entities.php
@ -196,19 +196,19 @@ return [
    'pages_edit_draft_save_at' => 'Melnraksts saglabāts ',
    'pages_edit_delete_draft' => 'Dzēst melnrakstu',
    'pages_edit_discard_draft' => 'Atmest malnrakstu',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_markdown' => 'Pārslēgties uz Markdown redaktoru',
+    'pages_edit_switch_to_markdown_clean' => '(Iztīrītais saturs)',
+    'pages_edit_switch_to_markdown_stable' => '(Stabilais saturs)',
+    'pages_edit_switch_to_wysiwyg' => 'Pārslēgties uz WYSIWYG redaktoru',
    'pages_edit_set_changelog' => 'Pievienot izmaiņu aprakstu',
    'pages_edit_enter_changelog_desc' => 'Ievadi nelielu aprakstu par vaiktajām izmaiņām',
    'pages_edit_enter_changelog' => 'Izmaiņu apraksts',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_title' => 'Pārslēgt redaktoru',
+    'pages_editor_switch_are_you_sure' => 'Vai tiešām vēlaties pārslēgt šai lapai lietojamo redaktoru?',
+    'pages_editor_switch_consider_following' => 'Pārslēdzot redaktorus, ņemiet vērā:',
+    'pages_editor_switch_consideration_a' => 'Pēc saglabāšanas jaunā redaktora izvēle tiks izmantota nākotnē visiem lietotājiem, tai skaitā tiem, kam var nebūt tiesības pašiem mainīt redaktora veidu.',
+    'pages_editor_switch_consideration_b' => 'Tas var noteiktos apstākļos novest pie iespējamiem noformējuma un sintakses zudumiem.',
+    'pages_editor_switch_consideration_c' => 'Birku vai izmaiņu saraksta ieraksti, kas veikti kopš pēdējās saglabāšanas, nesaglabāsies kopā ar šīm izmaiņām.',
    'pages_save' => 'Saglabāt lapu',
    'pages_title' => 'Lapas virsraksts',
    'pages_name' => 'Lapas nosaukums',
@ -235,7 +235,7 @@ return [
    'pages_revisions_number' => '#',
    'pages_revisions_numbered' => 'Revīzija #:id',
    'pages_revisions_numbered_changes' => 'Revīzijas #:id izmaiņas',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_editor' => 'Redaktora veids',
    'pages_revisions_changelog' => 'Izmaiņu žurnāls',
    'pages_revisions_changes' => 'Izmaiņas',
    'pages_revisions_current' => 'Pašreizējā versija',
--- a/resources/lang/lv/settings.php
+++ b/resources/lang/lv/settings.php
@ -10,8 +10,8 @@ return [
    'settings' => 'Iestatījumi',
    'settings_save' => 'Saglabāt iestatījumus',
    'settings_save_success' => 'Iestatījumi saglabāti',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'Sistēmas versija',
+    'categories' => 'Kategorijas',

    // App Settings
    'app_customization' => 'Pielāgojumi',
@ -27,8 +27,8 @@ return [
    'app_secure_images' => 'Paaugstinātas drošības attēlu ielāde',
    'app_secure_images_toggle' => 'Ieslēgt paaugstinātas drošības attēlu ielādi',
    'app_secure_images_desc' => 'Ātrdarbības nolūkos attēli ir publiski pieejami. Šī opcija pievieno nejaušu grūti uzminamu teksta virkni attēlu adresēs. Pārliecinieties kā ir izslēgta direktoriju pārlūkošana, lai nepieļautu vieglu piekļuvi šiem failiem.',
-    'app_default_editor' => 'Default Page Editor',
-    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_default_editor' => 'Noklusētais lapu redaktors',
+    'app_default_editor_desc' => 'Izvēlieties noklusēto redaktoru jaunu lapu rediģēšanai. To iespējams norādīt arī lapu līmenī, ja piekļuves tiesības to atļauj.',
    'app_custom_html' => 'Pielāgot HTML head saturu',
    'app_custom_html_desc' => 'Šis saturs tiks pievienots <head> sadaļas apakšā visām lapām. Tas ir noderīgi papildinot CSS stilus vai pievienojot analītikas kodu.',
    'app_custom_html_disabled_notice' => 'Pielāgots HTML head saturs ir izslēgts šajā uzstādījumu lapā, lai nodrošinātu, ka iespējams atcelt jebkādas kritiskas izmaiņas.',
@ -152,7 +152,7 @@ return [
    'role_access_api' => 'Piekļūt sistēmas API',
    'role_manage_settings' => 'Pārvaldīt iestatījumus',
    'role_export_content' => 'Eksportēt saturu',
-    'role_editor_change' => 'Change page editor',
+    'role_editor_change' => 'Mainīt lapu redaktoru',
    'role_asset' => 'Resursa piekļuves tiesības',
    'roles_system_warning' => 'Jebkuras no trīs augstāk redzamajām atļaujām dod iespēju lietotājam mainīt savas un citu lietotāju sistēmas atļaujas. Pievieno šīs grupu atļaujas tikai tiem lietotājiem, kuriem uzticies.',
    'role_asset_desc' => 'Šīs piekļuves tiesības kontrolē noklusēto piekļuvi sistēmas resursiem. Grāmatām, nodaļām un lapām norādītās tiesības būs pārākas par šīm.',
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Igauņu',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/nb/settings.php
+++ b/resources/lang/nb/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/nl/settings.php
+++ b/resources/lang/nl/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina (Argentijns Spaans)',
        'et' => 'Eesti keel (Estisch)',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français (Frans)',
        'he' => 'עברית (Hebreeuws)',
        'hr' => 'Hrvatski (Kroatisch)',
--- a/resources/lang/pl/settings.php
+++ b/resources/lang/pl/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Estoński',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/pt/settings.php
+++ b/resources/lang/pt/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/pt_BR/settings.php
+++ b/resources/lang/pt_BR/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/ru/settings.php
+++ b/resources/lang/ru/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/sk/settings.php
+++ b/resources/lang/sk/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/sl/settings.php
+++ b/resources/lang/sl/settings.php
@ -280,6 +280,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/sv/settings.php
+++ b/resources/lang/sv/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/tr/settings.php
+++ b/resources/lang/tr/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'İbranice',
        'hr' => 'Hrvatski',
--- a/resources/lang/uk/editor.php
+++ b/resources/lang/uk/editor.php
@ -24,7 +24,7 @@ return [
    'width' => 'Ширина',
    'height' => 'Висота',
    'More' => 'Більше',
-    'select' => 'Select...',
+    'select' => 'Вибрати…',

    // Toolbar
    'formats' => 'Формати',
@ -53,10 +53,10 @@ return [
    'align_left' => 'Вирівняти по лівому краю',
    'align_center' => 'Вирівняти по центру',
    'align_right' => 'Вирівнювання по правому краю',
-    'align_justify' => 'Justify',
+    'align_justify' => 'За шириною',
    'list_bullet' => 'Маркований список',
    'list_numbered' => 'Нумерований список',
-    'list_task' => 'Task list',
+    'list_task' => 'Список завдань',
    'indent_increase' => 'Збільшити відступ',
    'indent_decrease' => 'Зменшити відступ',
    'table' => 'Таблиця',
@ -95,8 +95,8 @@ return [
    'cell_type_cell' => 'Комірка',
    'cell_scope' => 'Scope',
    'cell_type_header' => 'Комірка заголовка',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
+    'merge_cells' => 'Об\'єднати комірки',
+    'split_cell' => 'Роз\'єднати комірку',
    'table_row_group' => 'Група рядків',
    'table_column_group' => 'Група стовпців',
    'horizontal_align' => 'Горизонтальне вирівнювання',
@ -154,7 +154,7 @@ return [
    'toggle_label' => 'Перемкнути ярлики',

    // About view
-    'about' => 'About the editor',
+    'about' => 'Про редактор',
    'about_title' => 'Про WYSIWYG редактор',
    'editor_license' => 'Ліцензія редактора і авторські права',
    'editor_tiny_license' => 'Цей редактор побудований за допомогою :tinyLink що забезпечується під ліцензією LGPL v2.1.',
--- a/resources/lang/uk/entities.php
+++ b/resources/lang/uk/entities.php
@ -196,14 +196,14 @@ return [
    'pages_edit_draft_save_at' => 'Чернетка збережена о ',
    'pages_edit_delete_draft' => 'Видалити чернетку',
    'pages_edit_discard_draft' => 'Відхилити чернетку',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_markdown' => 'Змінити редактор на Markdown',
+    'pages_edit_switch_to_markdown_clean' => '(Очистити вміст)',
+    'pages_edit_switch_to_markdown_stable' => '(Стабілізувати вміст)',
+    'pages_edit_switch_to_wysiwyg' => 'Змінити редактор на WYSIWYG',
    'pages_edit_set_changelog' => 'Встановити журнал змін',
    'pages_edit_enter_changelog_desc' => 'Введіть короткий опис внесених вами змін',
    'pages_edit_enter_changelog' => 'Введіть список змін',
-    'pages_editor_switch_title' => 'Switch Editor',
+    'pages_editor_switch_title' => 'Змінити редактор',
    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
--- a/resources/lang/uk/settings.php
+++ b/resources/lang/uk/settings.php
@ -10,8 +10,8 @@ return [
    'settings' => 'Налаштування',
    'settings_save' => 'Зберегти налаштування',
    'settings_save_success' => 'Налаштування збережено',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'Версія',
+    'categories' => 'Категорії',

    // App Settings
    'app_customization' => 'Налаштування',
@ -27,8 +27,8 @@ return [
    'app_secure_images' => 'Вищі налаштування безпеки для зображень',
    'app_secure_images_toggle' => 'Увімкунти вищі налаштування безпеки для завантаження зображень',
    'app_secure_images_desc' => 'З міркувань продуктивності всі зображення є загальнодоступними. Цей параметр додає випадковий, важко передбачуваний рядок перед URL-адресами зображень. Переконайтеся, що індексація каталогів не активована, щоб запобігти легкому доступу.',
-    'app_default_editor' => 'Default Page Editor',
-    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_default_editor' => 'Стандартний редактор сторінок',
+    'app_default_editor_desc' => 'Виберіть, який редактор буде використовуватися за замовчуванням під час редагування нових сторінок. Це можна перевизначити на рівні дозволів сторінки.',
    'app_custom_html' => 'Користувацький вміст HTML-заголовку',
    'app_custom_html_desc' => 'Будь-який доданий тут вміст буде вставлено в нижню частину розділу <head> кожної сторінки. Це зручно для перевизначення стилів, або додавання коду аналітики.',
    'app_custom_html_disabled_notice' => 'На цій сторінці налаштувань відключений користувацький вміст заголовка HTML, щоб гарантувати, що будь-які невдалі зміни можна буде відновити.',
@ -152,7 +152,7 @@ return [
    'role_access_api' => 'Доступ до системного API',
    'role_manage_settings' => 'Керування налаштуваннями програми',
    'role_export_content' => 'Вміст експорту',
-    'role_editor_change' => 'Change page editor',
+    'role_editor_change' => 'Змінити редактор сторінок',
    'role_asset' => 'Дозволи',
    'roles_system_warning' => 'Майте на увазі, що доступ до будь-якого з вищезазначених трьох дозволів може дозволити користувачеві змінювати власні привілеї або привілеї інших в системі. Ролі з цими дозволами призначайте лише довіреним користувачам.',
    'role_asset_desc' => 'Ці дозволи контролюють стандартні доступи всередині системи. Права на книги, розділи та сторінки перевизначать ці дозволи.',
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/uz/settings.php
+++ b/resources/lang/uz/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/vi/settings.php
+++ b/resources/lang/vi/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/zh_CN/settings.php
+++ b/resources/lang/zh_CN/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => 'עברית',
        'hr' => 'Hrvatski',
--- a/resources/lang/zh_TW/settings.php
+++ b/resources/lang/zh_TW/settings.php
@ -279,6 +279,7 @@ return [
        'es_AR' => 'Español Argentina',
        'et' => 'Eesti keel',
        'eu' => 'Euskara',
+        'fa' => 'فارسی',
        'fr' => 'Français',
        'he' => '希伯來語',
        'hr' => 'Hrvatski',
--- a/resources/views/api-docs/index.blade.php
+++ b/resources/views/api-docs/index.blade.php
@ -15,6 +15,7 @@
                        <div class="mb-xs"><a href="#request-format">Request Format</a></div>
                        <div class="mb-xs"><a href="#listing-endpoints">Listing Endpoints</a></div>
                        <div class="mb-xs"><a href="#error-handling">Error Handling</a></div>
+                        <div class="mb-xs"><a href="#rate-limits">Rate Limits</a></div>
                    </div>

                    @foreach($docs as $model => $endpoints)
--- a/resources/views/api-docs/parts/getting-started.blade.php
+++ b/resources/views/api-docs/parts/getting-started.blade.php
@ -160,4 +160,23 @@
 		"message": "No authorization token found on the request"
 	}
 }
-</code></pre>
+</code></pre>
+
+<hr>
+
+<h5 id="rate-limits" class="text-mono mb-m">Rate Limits</h5>
+<p>
+    The API has built-in per-user rate-limiting to prevent potential abuse using the API.
+    By default, this is set to 180 requests per minute but this can be changed by an administrator
+    by setting an "API_REQUESTS_PER_MIN" .env option like so:
+</p>
+
+<pre><code class="language-bash"># The number of API requests that can be made per minute by a single user.
+API_REQUESTS_PER_MIN=180</code></pre>
+
+<p>
+    When the limit is reached you will receive a 429 "Too Many Attempts." error response.
+    It's generally good practice to limit requests made from your API client, where possible, to avoid
+    affecting normal use of the system caused by over-consuming system resources.
+    Keep in mind there may be other rate-limiting factors such as web-server & firewall controls.
+</p>
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@ -615,7 +615,7 @@ class LdapTest extends TestCase

    public function test_dump_user_details_option_works()
    {
-        config()->set(['services.ldap.dump_user_details' => true]);
+        config()->set(['services.ldap.dump_user_details' => true, 'services.ldap.thumbnail_attribute' => 'jpegphoto']);

        $this->commonLdapMocks(1, 1, 1, 1, 1);
        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
@ -623,7 +623,9 @@ class LdapTest extends TestCase
            ->andReturn(['count' => 1, 0 => [
                'uid' => [$this->mockUser->name],
                'cn'  => [$this->mockUser->name],
-                'dn'  => ['dc=test' . config('services.ldap.base_dn')],
+                // Test dumping binary data for avatar responses
+                'jpegphoto' => base64_decode('/9j/4AAQSkZJRg=='),
+                'dn'        => ['dc=test' . config('services.ldap.base_dn')],
            ]]);

        $resp = $this->post('/login', [