Merge branch 'develop' of github.com:octobercms/october into develop

modules/backend/assets/css/october.css

@@ -10173,6 +10173,21 @@ body.dropdown-open .dropdown-overlay {
   margin-right: 0;
   padding-right: 0;
 }
+.control-tabs.content-tabs.tabs-inset ul.nav-tabs {
+  padding-left: 20px;
+}
+.control-tabs.content-tabs.tabs-inset ul.nav-tabs li {
+  border-top: 1px solid transparent;
+}
+.control-tabs.content-tabs.tabs-inset ul.nav-tabs li .active {
+  border-top: 1px solid #e3e5e7;
+}
+.control-tabs.content-tabs.tabs-inset ul.nav-tabs li:first-child {
+  border-left: 1px solid transparent;
+}
+.control-tabs.content-tabs.tabs-inset ul.nav-tabs li:first-child.active {
+  border-left: 1px solid #e3e5e7;
+}
 .control-tabs.content-tabs > ul.nav-tabs {
   position: relative;
 }
@@ -10201,7 +10216,6 @@ body.dropdown-open .dropdown-overlay {
   border-right: none;
 }
 .control-tabs.content-tabs > ul.nav-tabs li.active {
-  border-top: 1px solid #e3e5e7;
   background: #ffffff;
 }
 .control-tabs.content-tabs > ul.nav-tabs li.active a {

modules/backend/assets/less/controls/tab.less

@@ -245,6 +245,24 @@
     }
 
     &.content-tabs {
+        &.tabs-inset {
+            ul.nav-tabs {
+                padding-left: 20px;
+                li {
+                    border-top: 1px solid transparent;
+                    .active {
+                       border-top: 1px solid @color-tab-content-border;
+                    }
+                }
+                li:first-child {
+                    border-left: 1px solid transparent;
+                    &.active {
+                        border-left: 1px solid @color-tab-content-border;
+                    }
+                }
+            }
+        }
+
         > ul.nav-tabs {
             position: relative;
 
@@ -276,7 +294,6 @@
                 }
 
                 &.active {
-                    border-top: 1px solid @color-tab-content-border;
                     background: @color-tab-content-active-bg;
                     a {
                         font-weight: 600;

modules/backend/lang/nl/lang.php

@@ -23,7 +23,7 @@ return [
     'account' => [
         'sign_out' => 'Uitloggen',
         'login' => 'Inloggen',
-        'reset' => 'Reset',
+        'reset' => 'Wissen',
         'restore' => 'Herstellen',
         'login_placeholder' => 'gebruikersnaam',
         'password_placeholder' => 'wachtwoord',
@@ -146,22 +146,22 @@ return [
         'mass_assignment_failed' => "Mass assignment failed for Model attribute ':attribute'.",
     ],
     'warnings' => [
-        'tips' => 'System configuration tips',
-        'tips_description' => 'There are issues you need to pay attention to in order to configure the system properly.',
-        'permissions'  => 'Directory :name or its subdirectories is not writable for PHP. Please set corresponding permissions for the webserver on this directory.',
-        'extension' => 'The PHP extension :name is not installed. Please install this library and activate the extension.'
+        'tips' => 'Systeem configuratie tips',
+        'tips_description' => 'Er zijn fouten opgetreden in uw systeem. Los deze problemen op om uw systeem goed te configureren.',
+        'permissions'  => 'De map :name of de submapen zijn niet schrijfbaar voor PHP. Zet de bijhorende rechten voor de webserver in deze map.',
+        'extension' => 'De PHP extensie :name is niet geinstalleerd. Installeer deze versie en activeer de extensie.'
     ],
     'editor' => [
-        'menu_label' => 'Editor Preferences',
-        'menu_description' => 'Manage code editor preferences.',
-        'font_size' => 'Font size',
-        'tab_size' => 'Tab size',
-        'use_hard_tabs' => 'Indent using tabs',
-        'code_folding' => 'Code folding',
-        'word_wrap' => 'Word wrap',
-        'highlight_active_line' => 'Highlight active line',
-        'show_invisibles' => 'Show invisible characters',
-        'show_gutter' => 'Show gutter',
-        'theme' => 'Color scheme',
+        'menu_label' => 'Bewerker instellingen',
+        'menu_description' => 'Beheer code bewerker instellingen.',
+        'font_size' => 'Lettertype grootte',
+        'tab_size' => 'Tab positie',
+        'use_hard_tabs' => 'Inspringen met tabs',
+        'code_folding' => 'Code invouwing',
+        'word_wrap' => 'Tekstterugloop',
+        'highlight_active_line' => 'Markeer actieve lijnen',
+        'show_invisibles' => 'Toon verborgen karakters',
+        'show_gutter' => 'Toon regelnummers',
+        'theme' => 'Kleurschema',
     ],
 ];

modules/backend/layouts/_mainmenu.htm

@@ -25,7 +25,7 @@
             ?>
             <li class="icon preview">
                 <a href="<?= URL::to('/') ?>" target="_blank" data-toggle="tooltip" data-placement="bottom" title="<?= trans('backend::lang.tooltips.preview_website') ?>">
-                    <i class="icon-paw"></i>
+                    <i class="icon-bullseye"></i>
                 </a>
             </li>
             <li class="highlight account">