Merge branch 'master' of git://github.com/Ereza/BookStack into Ereza-master

diff --cc app/Config/app.php
index b15a75fcef074491886ba102b79e27e3d897bdd7,b4100a302e5a32bafd51889fe1e890381fadfd80..741c7fd1991b41c4e3e66d0973bebcb02f938222
--- 1/app/Config/app.php
--- 2/app/Config/app.php
+++ b/app/Config/app.php
@@@ -56,7 -63,7 +56,7 @@@ return 
      'locale' => env('APP_LANG', 'en'),
  
      // Locales available
-     'locales' => ['en', 'ar', 'bg', 'bs', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
 -    'locales' => ['en', 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
++    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'de_informal', 'es', 'es_AR', 'fa', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ru', 'th', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW',],
  
      //  Application Fallback Locale
      'fallback_locale' => 'en',

diff --cc app/Http/Middleware/Localization.php
index ce43a708936674666319546c1276ceb0a1a04028,de31b3a38b4de9d9e3c97165d484d2bbc1d44639..cd084746c5ca2b6ea432d5d2ab863e807bc94581
--- 1/app/Http/Middleware/Localization.php
--- 2/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@@ -18,7 -18,7 +18,8 @@@ class Localizatio
      protected $localeMap = [
          'ar' => 'ar',
          'bg' => 'bg_BG',
 +        'bs' => 'bs_BA',
+         'ca' => 'ca',
          'da' => 'da_DK',
          'de' => 'de_DE',
          'de_informal' => 'de_DE',

diff --cc resources/lang/en/settings.php
index 86877213d0742fe5114838ace62a97b0d6e5bebe,0810c17ccbe34e8b5c495c6375dd1c3577cdad4c..ab7f153224afd41bb90e9cd54a9472895727b619
--- 1/resources/lang/en/settings.php
--- 2/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -231,7 -231,7 +231,8 @@@ return 
          'en' => 'English',
          'ar' => 'العربية',
          'bg' => 'Bǎlgarski',
 +        'bs' => 'Bosanski',
+         'ca' => 'Català',
          'cs' => 'Česky',
          'da' => 'Dansk',
          'de' => 'Deutsch (Sie)',