From efd9e5bb90f7cc4f2f697b7eb4f8dcaf95ec90ed Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Thu, 15 May 2014 14:21:40 +1000
Subject: [PATCH 01/24] Minor rollback: We dont actually need to pass the
 context to beforeUpdate()

---
 modules/system/assets/js/framework.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index 7b81af809..099e2d815 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -66,7 +66,7 @@ if (window.jQuery === undefined)
                 /*
                  * Halt here if beforeUpdate() or data-request-before-update returns false
                  */
-                if (this.options.beforeUpdate.apply(this, [context, data, textStatus, jqXHR]) === false) return
+                if (this.options.beforeUpdate.apply(this, [data, textStatus, jqXHR]) === false) return
                 if (options.evalBeforeUpdate && eval('(function($el, context, data, textStatus, jqXHR) {'+options.evalBeforeUpdate+'}($el, context, data, textStatus, jqXHR))') === false) return
 
                 /*

From fd5d176f608e703d94b127f22f5302b45987de38 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Thu, 15 May 2014 16:22:22 +1000
Subject: [PATCH 02/24] Tighten up events

---
 modules/backend/widgets/Lists.php  | 12 ++++++------
 modules/cms/classes/Controller.php |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 9de52f232..dd5bd0592 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -514,8 +514,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.overrideHeaderValue', [$this, $column, $value])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.overrideHeaderValue', [$this, $column, $value], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.overrideHeaderValue', $this, $column, $value)) && is_array($response))
             $value = array_pop($response);
@@ -536,8 +536,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.overrideColumnValue', [$this, $record, $column, $value])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.overrideColumnValue', [$this, $record, $column, $value], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.overrideColumnValue', $this, $record, $column, $value)) && is_array($response))
             $value = array_pop($response);
@@ -557,8 +557,8 @@ class Lists extends WidgetBase
         /*
          * Extensibility
          */
-        if (($response = Event::fire('backend.list.injectRowClass', [$this, $record])) && is_array($response))
-            $value = array_pop($response);
+        if ($response = Event::fire('backend.list.injectRowClass', [$this, $record], true))
+            $value = $response;
 
         if (($response = $this->trigger('list.injectRowClass', $this, $record)) && is_array($response))
             $value = array_pop($response);
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index e7d3048bd..d6418f076 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -111,8 +111,8 @@ class Controller extends BaseController
         /*
          * Extensibility
          */
-        if (($event = Event::fire('cms.beforeDisplay', [$this, $url, $page])) && is_array($event))
-            return array_pop($event);
+        if ($event = Event::fire('cms.beforeDisplay', [$this, $url, $page], true))
+            return $event;
 
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
@@ -190,8 +190,8 @@ class Controller extends BaseController
         /*
          * Extensibility
          */
-        if (($event = Event::fire('cms.afterDisplay', [$this, $url, $page])) && is_array($event))
-            return array_pop($event);
+        if ($event = Event::fire('cms.afterDisplay', [$this, $url, $page], true))
+            return $event;
 
         return $result;
     }

From 5bf215e648c4f24bd2d8caf1637404497e09caad Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Thu, 15 May 2014 16:53:06 +1000
Subject: [PATCH 03/24] Fixes unit test (stat failure)

---
 modules/cms/classes/CmsObject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index e7810c9e7..171aa7191 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -338,7 +338,7 @@ class CmsObject
         }
 
         clearstatcache();
-        $this->mtime = File::lastModified($fullPath);
+        $this->mtime = @File::lastModified($fullPath);
         $this->originalFileName = $this->fileName;
     }
 

From bdff075058498e26ea0cd1c50f55b8c5783e9298 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Thu, 15 May 2014 17:23:46 +1000
Subject: [PATCH 04/24] Improve event emitter trait

---
 modules/backend/behaviors/FormController.php     |  4 ++--
 modules/backend/behaviors/ListController.php     | 12 ++++++------
 modules/backend/behaviors/RelationController.php |  4 ++--
 modules/backend/widgets/Form.php                 |  4 ++--
 modules/backend/widgets/Lists.php                | 16 ++++++++--------
 modules/backend/widgets/Search.php               |  2 +-
 modules/system/behaviors/SettingsModel.php       |  6 +++---
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index 73f8bce48..22c6f1da3 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -79,11 +79,11 @@ class FormController extends ControllerBehavior
          */
         $this->formWidget = $this->makeWidget('Backend\Widgets\Form', $config);
 
-        $this->formWidget->bind('form.extendFieldsBefore', function($host) {
+        $this->formWidget->bindEvent('form.extendFieldsBefore', function($host) {
             $this->controller->formExtendFieldsBefore($host);
         });
 
-        $this->formWidget->bind('form.extendFields', function($host) {
+        $this->formWidget->bindEvent('form.extendFields', function($host) {
             $this->controller->formExtendFields($host);
         });
 
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index d2d19e80e..ef93ddf20 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -128,23 +128,23 @@ class ListController extends ControllerBehavior
         /*
          * Extensibility helpers
          */
-        $widget->bind('list.extendQueryBefore', function($host, $query) use ($definition) {
+        $widget->bindEvent('list.extendQueryBefore', function($host, $query) use ($definition) {
             $this->controller->listExtendQueryBefore($query, $definition);
         });
 
-        $widget->bind('list.extendQuery', function($host, $query) use ($definition) {
+        $widget->bindEvent('list.extendQuery', function($host, $query) use ($definition) {
             $this->controller->listExtendQuery($query, $definition);
         });
 
-        $widget->bind('list.injectRowClass', function($host, $record) use ($definition) {
+        $widget->bindEvent('list.injectRowClass', function($host, $record) use ($definition) {
             return $this->controller->listInjectRowClass($record, $definition);
         });
 
-        $widget->bind('list.overrideColumnValue', function($host, $record, $column, $value) use ($definition) {
+        $widget->bindEvent('list.overrideColumnValue', function($host, $record, $column, $value) use ($definition) {
             return $this->controller->listOverrideColumnValue($record, $column->columnName, $definition);
         });
 
-        $widget->bind('list.overrideHeaderValue', function($host, $column, $value) use ($definition) {
+        $widget->bindEvent('list.overrideHeaderValue', function($host, $column, $value) use ($definition) {
             return $this->controller->listOverrideHeaderValue($column->columnName, $definition);
         });
 
@@ -162,7 +162,7 @@ class ListController extends ControllerBehavior
              * Link the Search Widget to the List Widget
              */
             if ($searchWidget = $toolbarWidget->getSearchWidget()) {
-                $searchWidget->bind('search.submit', function() use ($widget, $searchWidget) {
+                $searchWidget->bindEvent('search.submit', function() use ($widget, $searchWidget) {
                     $widget->setSearchTerm($searchWidget->getActiveTerm());
                     return $widget->onRender();
                 });
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 4f441618e..e36e2c8ad 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -498,7 +498,7 @@ class RelationController extends ControllerBehavior
             $config->showCheckboxes = true;
 
             $widget = $this->makeWidget('Backend\Widgets\Lists', $config);
-            $widget->bind('list.extendQueryBefore', function($host, $query) {
+            $widget->bindEvent('list.extendQueryBefore', function($host, $query) {
                 $this->relationObject->setQuery($query);
                 $this->relationObject->addConstraints();
             });
@@ -572,7 +572,7 @@ class RelationController extends ControllerBehavior
          * Exclude exisiting relationships
          */
         if ($this->manageMode == 'pivot' || $this->manageMode == 'list') {
-            $widget->bind('list.extendQueryBefore', function($host, $query) {
+            $widget->bindEvent('list.extendQueryBefore', function($host, $query) {
 
                 /*
                  * Where not in the current list of related records
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 43c6ea7b1..ec6848472 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -218,7 +218,7 @@ class Form extends WidgetBase
          * Extensibility
          */
         Event::fire('backend.form.extendFieldsBefore', [$this]);
-        $this->trigger('form.extendFieldsBefore', $this);
+        $this->fireEvent('form.extendFieldsBefore', $this);
 
         /*
          * Outside fields
@@ -248,7 +248,7 @@ class Form extends WidgetBase
          * Extensibility
          */
         Event::fire('backend.form.extendFields', [$this]);
-        $this->trigger('form.extendFields', $this);
+        $this->fireEvent('form.extendFields', $this);
 
         /*
          * Convert automatic spanned fields
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index dd5bd0592..67e4f9974 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -259,7 +259,7 @@ class Lists extends WidgetBase
          * Extensibility
          */
         Event::fire('backend.list.extendQueryBefore', [$this, $query]);
-        $this->trigger('list.extendQueryBefore', $this, $query);
+        $this->fireEvent('list.extendQueryBefore', [$this, $query]);
 
         /*
          * Related custom selects, must come first
@@ -331,7 +331,7 @@ class Lists extends WidgetBase
          * Extensibility
          */
         Event::fire('backend.list.extendQuery', [$this, $query]);
-        $this->trigger('list.extendQuery', $this, $query);
+        $this->fireEvent('list.extendQuery', [$this, $query]);
 
         // Grouping due to the joinWith() call
         $query->select($selects);
@@ -517,8 +517,8 @@ class Lists extends WidgetBase
         if ($response = Event::fire('backend.list.overrideHeaderValue', [$this, $column, $value], true))
             $value = $response;
 
-        if (($response = $this->trigger('list.overrideHeaderValue', $this, $column, $value)) && is_array($response))
-            $value = array_pop($response);
+        if ($response = $this->fireEvent('list.overrideHeaderValue', [$this, $column, $value], true))
+            $value = $response;
 
         return $value;
     }
@@ -539,8 +539,8 @@ class Lists extends WidgetBase
         if ($response = Event::fire('backend.list.overrideColumnValue', [$this, $record, $column, $value], true))
             $value = $response;
 
-        if (($response = $this->trigger('list.overrideColumnValue', $this, $record, $column, $value)) && is_array($response))
-            $value = array_pop($response);
+        if ($response = $this->fireEvent('list.overrideColumnValue', [$this, $record, $column, $value], true))
+            $value = $response;
 
         return $value;
     }
@@ -560,8 +560,8 @@ class Lists extends WidgetBase
         if ($response = Event::fire('backend.list.injectRowClass', [$this, $record], true))
             $value = $response;
 
-        if (($response = $this->trigger('list.injectRowClass', $this, $record)) && is_array($response))
-            $value = array_pop($response);
+        if ($response = $this->fireEvent('list.injectRowClass', [$this, $record], true))
+            $value = $response;
 
         return $value;
     }
diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php
index 8832fb805..1cf2dca6e 100644
--- a/modules/backend/widgets/Search.php
+++ b/modules/backend/widgets/Search.php
@@ -90,7 +90,7 @@ class Search extends WidgetBase
          * Trigger class event, merge results as viewable array
          */
         $params = func_get_args();
-        $result = $this->trigger('search.submit', $params);
+        $result = $this->fireEvent('search.submit', [$params]);
         return Util::arrayMerge($result);
     }
 
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 88a8ebd89..70e958928 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -52,9 +52,9 @@ class SettingsModel extends ModelBehavior
         /*
          * Access to model's overrides is unavailable, using events instead
          */
-        $this->model->bind('model.afterFetch', [$this, 'afterModelFetch']);
-        $this->model->bind('model.beforeSave', [$this, 'beforeModelSave']);
-        $this->model->bind('model.afterSetAttribute', [$this, 'setModelAttribute']);
+        $this->model->bindEvent('model.afterFetch', [$this, 'afterModelFetch']);
+        $this->model->bindEvent('model.beforeSave', [$this, 'beforeModelSave']);
+        $this->model->bindEvent('model.afterSetAttribute', [$this, 'setModelAttribute']);
 
         /*
          * Parse the config

From 31982dc23527e71a6a397527fd44438520b487ac Mon Sep 17 00:00:00 2001
From: RomanGorbatko <romangorbatko@gmail.com>
Date: Thu, 15 May 2014 10:54:00 +0300
Subject: [PATCH 05/24] Update .htaccess

If site don't work without "index.php" in URL, need add this string.
---
 .htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.htaccess b/.htaccess
index e14522250..a18974474 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,7 @@
     </IfModule>
 
     RewriteEngine On
+    RewriteBase /
 
     ##
     ## Handle resource requests

From c6df6f897b9532ad1667ddad8d73a0b430a5b3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emir=20Kars=CC=A7=C4=B1yakal=C4=B1?=
 <emirkarsiyakali@gmail.com>
Date: Thu, 15 May 2014 13:31:17 +0300
Subject: [PATCH 06/24] Added Turkish language files

---
 modules/backend/lang/tr/lang.php      | 128 +++++++++++++++++++++++++
 modules/cms/lang/tr/lang.php          | 132 ++++++++++++++++++++++++++
 modules/system/lang/tr/lang.php       |  96 +++++++++++++++++++
 modules/system/lang/tr/validation.php | 108 +++++++++++++++++++++
 4 files changed, 464 insertions(+)
 create mode 100644 modules/backend/lang/tr/lang.php
 create mode 100644 modules/cms/lang/tr/lang.php
 create mode 100644 modules/system/lang/tr/lang.php
 create mode 100644 modules/system/lang/tr/validation.php

diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
new file mode 100644
index 000000000..5660001a7
--- /dev/null
+++ b/modules/backend/lang/tr/lang.php
@@ -0,0 +1,128 @@
+<?php
+
+return [
+    'field' => [
+        'invalid_type' => 'Invalid field type used :type.',
+        'options_method_not_exists' => 'The model class :model must define a method :method() returning options for the ":field" form field.',
+    ],
+    'widget' => [
+        'not_registered' => "A widget class name ':name' has not been registered",
+        'not_bound' => "A widget with class name ':name' has not been bound to the controller",
+    ],
+    'page' => [
+        'untitled' => "Başlıksız",
+    ],
+    'partial' => [
+        'not_found' => "':name' bölümü bulunamadı.",
+    ],
+    'account' => [
+        'sign_out' => 'Çıkış',
+        'login' => 'Giriş',
+        'reset' => 'Sıfırla',
+        'restore' => 'Geri yükle',
+        'login_placeholder' => 'kullanıcı adı',
+        'password_placeholder' => 'parola',
+        'forgot_password' => "Parolanızı mı unuttunuz?",
+        'enter_email' => "Email adresinizi girin",
+        'enter_login' => "Kullanıcı adınızı girin",
+        'email_placeholder' => "email",
+        'enter_new_password' => "Yeni Parolanızı girin",
+        'password_reset' => "Parola Sıfırla",
+        'restore_success' => "Email adresinize parolanızı nasıl sıfırlayacağınıza dair bilgiler gönderilmiştir.",
+        'restore_error' => "':login' kullanıcı adı bulunamadı.",
+        'reset_success' => "Parolanız başarıyla sıfırlandı. Giriş yapabilirsiniz.",
+        'reset_error' => "Hatalı giriş yaptınız. Lütfen tekrar deneyin!",
+        'reset_fail' => "Parolanız sıfırlanamıyor!",
+        'apply' => 'Onayla',
+        'cancel' => 'İptal',
+        'delete' => 'Sil',
+        'ok' => 'OK',
+    ],
+    'dashboard' => [
+        'menu_label' => 'Pano',
+    ],
+    'user' => [
+        'name' => 'Yönetici',
+        'menu_label' => 'Yöneticiler',
+        'list_title' => 'Yöneticileri Yönet',
+        'login' => "Kullanıcı Adı",
+        'first_name' => "Adı",
+        'last_name' => "Soyadı",
+        'full_name' => "Tam Adı",
+        'email' => "Email",
+        'groups' => "Gruplar",
+        'groups_comment' => "Kullanıcının hangi gruba bağlı olduğunu belirleyin.",
+        'avatar' => "Avatar",
+        'password' => "Parola",
+        'password_confirmation' => "Parola Onayı",
+        'superuser' => "Süper Kullanıcı",
+        'superuser_comment' => "Kullanıcıya her alanda yetki vermek için burayı işaretleyin.",
+        'send_invite' => 'Email ile davet gönder',
+        'send_invite_comment' => 'Kullanıcının email adresine davet göndermek için burayı işaretleyin',
+        'group' => [
+            'name' => 'Grup',
+            'name_field' => 'Adı',
+            'menu_label' => 'Gruplar',
+            'list_title' => 'Grupları Yönet',
+        ],
+        'preferences' => [
+            'not_authenticated' => 'There is no an authenticated user to load or save preferences for.'
+        ]
+    ],
+    'list' => [
+        'default_title' => 'Liste',
+        'search_prompt' => 'Arama...',
+        'no_records' => 'There are no records in this view.',
+        'missing_model' => 'List behavior used in :class does not have a model defined.',
+        'missing_column' => 'There are no column definitions for :columns.',
+        'missing_columns' => 'List used in :class has no list columns defined.',
+        'missing_definition' => "List behavior does not contain a column for ':field'.",
+        'behavior_not_ready' => 'List behavior has not been initialized, check that you have called makeLists() in your controller.',
+    ],
+    'form' => [
+        'create_title' => ":name Oluştur",
+        'update_title' => ":name Düzenle",
+        'preview_title' => ":name Görüntüle",
+        'create_success' => ':name başarıyla oluşturuldu',
+        'update_success' => ':name başarıyla güncellendi',
+        'delete_success' => ':name başarıyla silindi',
+        'missing_id' => "Form record ID has not been specified.",
+        'missing_model' => 'Form behavior used in :class does not have a model defined.',
+        'missing_definition' => "Form behavior does not contain a field for ':field'.",
+        'not_found' => 'Form record with an ID of :id could not be found.',
+        'save' => 'Kaydet',
+        'save_and_close' => 'Kaydet ve kapat',
+        'saving' => 'Kaydediliyor...',
+        'undefined_tab' => 'Diğer',
+        'field_off' => 'Kapalı',
+        'field_on' => 'Açık',
+        'apply' => 'Kabul',
+        'cancel' => 'İptal',
+        'close' => 'Kapat',
+        'delete' => 'Sil',
+        'ok' => 'OK',
+        'confirm_tab_close' => 'Bu sekmeyi kapatmak istediğinize gerçekten emin misiniz? Kaydedilmemiş değişiklikleri kaybedeceksiniz.',
+        'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
+    ],
+    'relation' => [
+        'missing_definition' => "Relation behavior does not contain a definition for ':field'.",
+        'missing_model' => "Relation behavior used in :class does not have a model defined.",
+        'invalid_action_single' => "This action cannot be performed on a singular relationship.",
+        'invalid_action_multi' => "This action cannot be performed on a multiple relationship.",
+        'add' => "Ekle",
+        'add_name' => ":name Ekle",
+        'create' => "Oluştur",
+        'create_name' => ":name Oluştur",
+        'remove' => "Kaldır",
+        'remove_name' => ":name Kaldır",
+        'delete' => "Sil",
+        'delete_name' => ":name Sil",
+    ],
+    'model' => [
+        'name' => "Model",
+        'not_found' => "Model ':class' with an ID of :id could not be found",
+        'missing_id' => "There is no ID specified for looking up the model record.",
+        'missing_relation' => "Model ':class' does not contain a definition for ':relation'.",
+        'invalid_class' => "Model :model used in :class is not valid, it must inherit the \Model class.",
+    ],
+];
\ No newline at end of file
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
new file mode 100644
index 000000000..9a8cdc70b
--- /dev/null
+++ b/modules/cms/lang/tr/lang.php
@@ -0,0 +1,132 @@
+<?php
+
+return [
+    'cms_object' => [
+        'invalid_file' => 'Hatalı dosya adı: :name. File names can contain only alphanumeric symbols, underscores, dashes and dots. Bazı doğru dosya adı örnekleri: page.htm, page, subdirectory/page',
+        'invalid_property' => 'The property ":name" cannot be set',
+        'file_already_exists' => '":name" isimli dosya mevcut.',
+        'error_saving' => '":name" kaydedilirken hatayla karşılaşıldı.',
+        'error_creating_directory' => ':name klasörü oluşturulurken hatayla karşılaşıldı',
+        'invalid_file_extension'=>'Hatalı dosya uzantısı: :invalid. İzin verilen uzantılar: :allowed.',
+        'error_deleting' => '":name" şablon dosyası silinirken hatayla karşılaşıldı.',
+        'delete_success' => ':count şablon başarıyla silindi.',
+        'file_name_required' => 'Dosya adı alanı gereklidir.'
+    ],
+    'theme' => [
+        'active' => [
+            'not_set' => "The active theme is not set.",
+        ],
+        'edit' => [
+            'not_set' => "The edit theme is not set.",
+            'not_found' => "The edit theme is not found.",
+            'not_match' => "The object you're trying to access doesn't belong to the theme being edited. Please reload the page."
+        ]
+    ],
+    'page' => [
+        'not_found' => [
+            'label' => "Sayfa bulunamadı",
+            'help' => "İstenilen sayfa bulunamadı.",
+        ],
+        'custom_error' => [
+            'label' => "Sayfa hatası",
+            'help' => "Üzgünüz, bir şeyler ters gitti ve sayfa görüntülenemiyor.",
+        ],
+        'menu_label' => 'Sayfalar',
+        'no_list_records' => 'Hiç sayfa yok.',
+        'new' => 'Sayfa oluştur',
+        'invalid_url' => 'Hata URL formatı. The URL should start with the forward slash symbol and can contain digits, Latin letters and the following symbols: _-[]:?|/+*',
+        'delete_confirm_multiple' => 'Seçili sayfaları silmek istediğinize emin misiniz?',
+        'delete_confirm_single' => 'Bu sayfayı silmek istediğinize emin misiniz?',
+        'no_layout' => '-- şablon yok --'
+    ],
+    'layout' => [
+        'not_found' => "':name' isimli şablon bulunamadı",
+        'menu_label' => 'Şablonlar',
+        'no_list_records' => 'Şablon bulunamadı',
+        'new' => 'Şablon oluştur',
+        'delete_confirm_multiple' => 'Seçili şablonları silmek istediğinize emin misiniz?',
+        'delete_confirm_single' => 'Seçili şablonu silmek istediğinize emin misiniz?'
+    ],
+    'partial' => [
+        'invalid_name' => "Hatalı bölüm adı: :name.",
+        'not_found' => "':name' bölümü bulunamadı.",
+        'menu_label' => 'Bölümler',
+        'no_list_records' => 'Bölüm bulunamadı.',
+        'delete_confirm_multiple' => 'Seçili bölümleri silmek istediğinize gerçekten emin misiniz?',
+        'delete_confirm_single' => 'Bu bölümü silmek istediğinize emin misiniz?',
+        'new' => 'Bölüm Oluştur'
+    ],
+    'content' => [
+        'not_found' => "':name' isminde içerik dosyası bulunamadı.",
+        'menu_label' => 'İçerik',
+        'no_list_records' => 'İçerik dosyası bulunamadı.',
+        'delete_confirm_multiple' => 'Seçili içerik dosyaları veya klasörlerini silmek istediğinize gerçekten emin misiniz?',
+        'delete_confirm_single' => 'Bu içerik dosyasını silmek istediğinize emin misiniz?',
+        'new' => 'Yeni İçerik'
+    ],
+    'ajax_handler' => [
+        'invalid_name' => "Hatalı AJAX işleyici adı: :name.",
+        'not_found' => "':name' isimli AJAX işleyici bulunamadı.",
+    ],
+    'combiner' => [
+        'not_found' => "The combiner file ':name' is not found.",
+    ],
+    'cms' => [
+        'menu_label' => "CMS"
+    ],
+    'asset' => [
+        'menu_label' => "Dosyalar",
+        'drop_down_add_title' => 'Ekle...',
+        'drop_down_operation_title' => 'İşlemler...',
+        'upload_files' => 'Dosya(lar) yükle',
+        'create_file' => 'Dosya oluştur',
+        'create_directory' => 'Klasör oluştur',
+        'rename' => 'Yeniden isimlendir',
+        'delete' => 'Sil',
+        'move' => 'Taşı',
+        'new' => 'Yeni dosya',
+        'rename_popup_title' => 'Yeniden isimlendir',
+        'rename_new_name' => 'Yeni isim',
+        'invalid_path' => 'Path can contain only digits, Latin letters, spaces and the following symbols: ._-/',
+        'error_deleting_file' => ':name dosyası silinirken hatayla karşılaşıldı.',
+        'error_deleting_dir_not_empty' => 'Error deleting directory :name. The directory is not empty.',
+        'error_deleting_dir' => ':name dosyası silinirken hatayla karşılaşıldı.',
+        'invalid_name' => 'Name can contain only digits, Latin letters, spaces and the following symbols: ._-',
+        'original_not_found' => 'Original file or directory not found',
+        'already_exists' => 'File or directory with this name already exists',
+        'error_renaming' => 'Error renaming the file or directory',
+        'name_cant_be_empty' => 'İsim alanı boş bırakılamaz.',
+        'too_large' => 'Yüklenen dosya çok büyük. İzin verilen maksimum boyut :max_size',
+        'type_not_allowed' => 'İzin verilen dosya tipleri: :allowed_types',
+        'file_not_valid' => 'Dosya geçerli değil',
+        'error_uploading_file' => '":name" yüklenirken hatayla karşılaşıldı: :error',
+        'move_please_select' => 'lütfen seçiniz',
+        'move_destination' => 'Hedef klasör',
+        'move_popup_title' => 'Assets taşı',
+        'move_button' => 'Taşı',
+        'selected_files_not_found' => 'Seçilen dosyalar bulunamadı.',
+        'select_destination_dir' => 'Lütfen hedef klasör seçiniz',
+        'destination_not_found' => 'Hedef klasör bulunamadı',
+        'error_moving_file' => ':file dosyası taşınırken hatayla karşılaşıldı',
+        'error_moving_directory' => ':dir klasörü taşınırken hatayla karşılaşıldı',
+        'error_deleting_directory' => ':dir klasörü silinirken hatayla karşılaşıldı',
+        'path' => 'Yol'
+    ],
+    'component' => [
+        'menu_label' => "Bileşenler",
+        'unnamed' => "İsimsiz",
+        'no_description' => "Açıklama girilmedi.",
+        'alias' => "Takma ad",
+        'alias_description' => "A unique name given to this component when using it in the page or layout code.",
+        'validation_message' => "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.",
+        'invalid_request' => "Şablon hatalı bileşen verisi olduğu için kaydedilemedi.",
+        'no_records' => 'Bileşen bulunamadı.',
+        'not_found' => "':name' isimli bileşen bulunamadı.",
+        'method_not_found' => "':name' isimli bileşen ':method'unu içermiyor.",
+    ],
+    'template' => [
+        'invalid_type' => "Hatalı şablon tipi.",
+        'not_found' => "İstenilen şablon bulunamadı.",
+        'saved'=> "Şablon başarıyla kaydedildi."
+    ]
+];
\ No newline at end of file
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
new file mode 100644
index 000000000..06872d7c5
--- /dev/null
+++ b/modules/system/lang/tr/lang.php
@@ -0,0 +1,96 @@
+<?php
+
+return [
+    'app' => [
+        'name' => 'October CMS',
+        'motto' => 'Getting back to basics',
+    ],
+    'directory' => [
+        'create_fail' => "Klasör oluşturulamıyor: :name",
+    ],
+    'file' => [
+        'create_fail' => "Dosya oluşturulamıyor: :name",
+    ],
+    'system' => [
+        'name' => 'Sistem',
+        'menu_label' => 'Sistem',
+    ],
+    'plugin' => [
+        'unnamed' => 'İsimsiz eklenti',
+        'name' => [
+            'label' => 'Eklenti Adı',
+            'help' => 'Eklenti adı eşsiz olmalıdır. Örneğin, RainLab.Blog',
+        ],
+    ],
+    'project' => [
+        'name' => 'Proje',
+        'owner_label' => 'Sahibi',
+        'id' => [
+            'label' => 'Proje ID',
+            'help' => 'Proje ID\'sini nasıl bulurum?',
+            'missing' => 'Lütfen kullanılacak Proje ID\'sini belirleyin.',
+        ],
+        'unbind_success' => 'Project has been detached successfully.',
+    ],
+    'settings' => [
+        'menu_label' => 'Ayarlar',
+        'missing_model' => 'The settings page is missing a Model definition.',
+        'update_success' => 'Settings for :name have been updated successfully.',
+    ],
+    'install' => [
+        'project_label' => 'Projeye bağla',
+        'plugin_label' => 'Eklenti Yükle',
+        'missing_plugin_name' => 'Yüklemek istediğiniz eklentinin adını girin.',
+        'install_completing' => 'Finishing installation process',
+        'install_success' => 'The plugin has been installed successfully.',
+    ],
+    'updates' => [
+        'name' => 'Yazılım Güncelleme',
+        'menu_label' => 'Güncellemeler',
+        'check_label' => 'Güncellemeleri kontrol et',
+        'retry_label' => 'Tekrar dene',
+        'core_build' => 'Mevcut versiyon',
+        'core_build_old' => 'Mevcut versiyon :build',
+        'core_build_new' => 'Versiyon :build',
+        'core_build_new_help' => 'Son versiyon kullanılabilir.',
+        'core_downloading' => 'Uygulama dosyaları indiriliyor',
+        'core_extracting' => 'Uygulama dosyaları çıkarılıyor',
+        'plugin_downloading' => 'Eklenti indiriliyor: :name',
+        'plugin_extracting' => 'Eklenti dosyaları çıkarılıyor: :name',
+        'plugin_version_none' => 'Yeni eklenti',
+        'plugin_version_old' => 'Mevcut v:version',
+        'plugin_version_new' => 'v:version',
+        'update_label' => 'Yazılım güncelle',
+        'update_completing' => 'Güncelleme işlemi bitiyor',
+        'update_loading' => 'Kullanılabilir güncellemeler yükleniyor...',
+        'update_success' => 'Güncelleme işlemi başarıyla sonuçlandı.',
+        'update_failed_label' => 'Güncelleme hatası',
+        'force_label' => 'Güncellemeye zorla',
+        'found' => [
+            'label' => 'Güncellemeler bulundu!',
+            'help' => 'Yazılım güncelleye tıklayarak güncelleme işlemini başlatabilirsiniz.',
+        ],
+        'none' => [
+            'label' => 'Güncelleme yok',
+            'help' => 'Yenü güncelleme bulunamadı.',
+        ],
+    ],
+    'server' => [
+        'connect_error' => 'Sunucuyla bağlantı kurulamadı.',
+        'response_not_found' => 'Güncelleme sunucusu bulunamadı.',
+        'response_invalid' => 'Sunucudan hatalı cevap geldi.',
+        'response_empty' => 'Sunucudan boş cevap geldi.',
+        'file_error' => 'Paket teslim edilirken sunucuda hata meydana geldi.',
+        'file_corrupt' => 'Sunucudaki dosya bozulmuş.',
+    ],
+    'behavior' => [
+        'missing_property' => 'Class :class must define property $:property used by :behavior behavior.',
+    ],
+    'config' => [
+        'not_found' => 'Unable to find configuration file :file defined for :location.',
+        'required' => 'Configuration used in :location must supply a value :property.',
+    ],
+    'zip' => [
+        'extract_failed' => "Unable to extract core file ':file'.",
+    ],
+];
\ No newline at end of file
diff --git a/modules/system/lang/tr/validation.php b/modules/system/lang/tr/validation.php
new file mode 100644
index 000000000..c40becc52
--- /dev/null
+++ b/modules/system/lang/tr/validation.php
@@ -0,0 +1,108 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+
+    **
+     * Laravel - A PHP Framework For Web Artisans
+     *
+     * @package  Language
+     * @version  4.x
+     * @author   Sinan Eldem <sinan@sinaneldem.com.tr>
+     * @link     http://sinaneldem.com.tr
+    */
+
+    "accepted"       => ":attribute kabul edilmelidir.",
+    "active_url"     => ":attribute geçerli bir URL olmalıdır.",
+    "after"          => ":attribute şundan daha eski bir tarih olmalıdır :date.",
+    "alpha"          => ":attribute sadece harflerden oluşmalıdır.",
+    "alpha_dash"     => ":attribute sadece harfler, rakamlar ve tirelerden oluşmalıdır.",
+    "alpha_num"      => ":attribute sadece harfler ve rakamlar içermelidir.",
+    "array"          => ":attribute dizi olmalıdır.",
+    "before"         => ":attribute şundan daha önceki bir tarih olmalıdır :date.",
+    "between"        => array(
+        "numeric" => ":attribute :min - :max arasında olmalıdır.",
+        "file"    => ":attribute :min - :max arasındaki kilobayt değeri olmalıdır.",
+        "string"  => ":attribute :min - :max arasında karakterden oluşmalıdır.",
+        "array"   => ":attribute :min - :max arasında nesneye sahip olmalıdır."
+    ),
+    "confirmed"      => ":attribute tekrarı eşleşmiyor.",
+    "date"            => ":attribute geçerli bir tarih olmalıdır.",
+    "date_format"     => ":attribute :format biçimi ile eşleşmiyor.",
+    "different"      => ":attribute ile :other birbirinden farklı olmalıdır.",
+    "digits"          => ":attribute :digits rakam olmalıdır.",
+    "digits_between"  => ":attribute :min ile :max arasında rakam olmalıdır.",
+    "email"          => ":attribute biçimi geçersiz.",
+    "exists"         => "Seçili :attribute geçersiz.",
+    "image"          => ":attribute alanı resim dosyası olmalıdır.",
+    "in"             => ":attribute değeri geçersiz.",
+    "integer"        => ":attribute rakam olmalıdır.",
+    "ip"             => ":attribute geçerli bir IP adresi olmalıdır.",
+    "max"             => array(
+        "numeric" => ":attribute değeri :max değerinden küçük olmalıdır.",
+        "file"    => ":attribute değeri :max kilobayt değerinden küçük olmalıdır.",
+        "string"  => ":attribute değeri :max karakter değerinden küçük olmalıdır.",
+        "array"   => ":attribute değeri :max adedinden az nesneye sahip olmalıdır."
+    ),
+    "mimes"          => ":attribute dosya biçimi :values olmalıdır.",
+    "min"            => array(
+        "numeric" => ":attribute değeri :min değerinden büyük olmalıdır.",
+        "file"    => ":attribute değeri :min kilobayt değerinden büyük olmalıdır.",
+        "string"  => ":attribute değeri :min karakter değerinden büyük olmalıdır.",
+        "array"   => ":attribute en az :min nesneye sahip olmalıdır."
+    ),
+    "not_in"         => "Seçili :attribute geçersiz.",
+    "numeric"        => ":attribute rakam olmalıdır.",
+    "regex"           => ":attribute biçimi geçersiz.",
+    "required"       => ":attribute alanı gereklidir.",
+    "required_if"      => ":attribute alanı, :other :value değerine sahip olduğunda zorunludur.",
+    "required_with"   => ":attribute alanı :values varken zorunludur.",
+    "required_with_all" => ":attribute alanı :values varken zorunludur.",
+    "required_without" => ":attribute alanı :values yokken zorunludur.",
+    "required_without_all" => ":attribute alanı :values yokken zorunludur.",
+    "same"           => ":attribute ile :other eşleşmelidir.",
+    "size"           => array(
+        "numeric" => ":attribute :size olmalıdır.",
+        "file"    => ":attribute :size kilobyte olmalıdır.",
+        "string"  => ":attribute :size karakter olmalıdır.",
+        "array"   => ":attribute :size nesneye sahip olmalıdır."
+    ),
+    "unique"         => ":attribute daha önceden kayıt edilmiş.",
+    "url"            => ":attribute biçimi geçersiz.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);
\ No newline at end of file

From f4bf9e192fe07034ff3da911b42fb75bb35900c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=CC=88r=20Karlsson?= <me@iamacoder.com>
Date: Thu, 15 May 2014 15:17:41 +0200
Subject: [PATCH 07/24] Added swedish language support

---
 modules/backend/lang/sv/lang.php      | 128 +++++++++++++++++++++++++
 modules/cms/lang/sv/lang.php          | 132 ++++++++++++++++++++++++++
 modules/system/lang/sv/lang.php       |  96 +++++++++++++++++++
 modules/system/lang/sv/validation.php |  98 +++++++++++++++++++
 4 files changed, 454 insertions(+)
 create mode 100644 modules/backend/lang/sv/lang.php
 create mode 100644 modules/cms/lang/sv/lang.php
 create mode 100644 modules/system/lang/sv/lang.php
 create mode 100644 modules/system/lang/sv/validation.php

diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
new file mode 100644
index 000000000..02a958604
--- /dev/null
+++ b/modules/backend/lang/sv/lang.php
@@ -0,0 +1,128 @@
+<?php
+
+return [
+    'field' => [
+        'invalid_type' => 'Felaktig fälttyp använd :type.',
+        'options_method_not_exists' => 'Modelklassen :model måste definera en metod :method() som returnerar villkor för formfältet ":field"',
+    ],
+    'widget' => [
+        'not_registered' => "En widget med klassnamnet ':name' har ej blivit registrerad",
+        'not_bound' => "En widget med klassnamnet ':name' saknas i controllern",
+    ],
+    'page' => [
+        'untitled' => "Ej namngiven",
+    ],
+    'partial' => [
+        'not_found' => "En partial med namn ':name' kunde ej hittas",
+    ],
+    'account' => [
+        'sign_out' => 'Logga ut',
+        'login' => 'Logga in',
+        'reset' => 'Nollställ',
+        'restore' => 'Återställ',
+        'login_placeholder' => 'användarnamn',
+        'password_placeholder' => 'lösenord',
+        'forgot_password' => "Glömt ditt lösenord?",
+        'enter_email' => "Ange din epost-adress",
+        'enter_login' => "Ange ditt användarnamn",
+        'email_placeholder' => "epost",
+        'enter_new_password' => "Välj ett nytt lösenord",
+        'password_reset' => "Återställ lösenord",
+        'restore_success' => "Ett meddelande har sänts till din epost-adress med instruktioner om hur du återställer ditt lösenord",
+        'restore_error' => "En användare med användarnamnet ':login' kunde ej hittas",
+        'reset_success' => "Ditt lösenord har blivit återställt. Du kan nu logga in",
+        'reset_error' => "Felaktig data för lösenordsåterställning. Var vänlig prova igen",
+        'reset_fail' => "Det gick tyvärr inte att nollställa ditt lösenord",
+        'apply' => 'Spara',
+        'cancel' => 'Avbryt',
+        'delete' => 'Radera',
+        'ok' => 'OK',
+    ],
+    'dashboard' => [
+        'menu_label' => 'Kontrollpanelen',
+    ],
+    'user' => [
+        'name' => 'Administratör',
+        'menu_label' => 'Administratörer',
+        'list_title' => 'Hantera administratörer',
+        'login' => "Logga in",
+        'first_name' => "Förnamn",
+        'last_name' => "Efternamn",
+        'full_name' => "Fullständigt namn",
+        'email' => "E-post",
+        'groups' => "Grupper",
+        'groups_comment' => "Välj vilken grupp denna person hör till",
+        'avatar' => "Avatar",
+        'password' => "Lösenord",
+        'password_confirmation' => "Bekräfta lösenord",
+        'superuser' => "Superanvändare",
+        'superuser_comment' => "Markera denna checkbox för att ge denna person tillgång till alla områden",
+        'send_invite' => 'Inbjudan är sänd via e-post',
+        'send_invite_comment' => 'Markera denna checkbox för att skicka en inbjudan till användaren via e-post',
+        'group' => [
+            'name' => 'Grupp',
+            'name_field' => 'Namn',
+            'menu_label' => 'Grupper',
+            'list_title' => 'Hantera grupper',
+        ],
+        'preferences' => [
+            'not_authenticated' => 'Det finns ingen autentiserad användare att ladda eller spara inställningar för',
+        ]
+    ],
+    'list' => [
+        'default_title' => 'Lista',
+        'search_prompt' => 'Sök...',
+        'no_records' => 'Det finns inga träffar för denna vy',
+        'missing_model' => 'List-egenskapen i :class har ingen modell definerad',
+        'missing_column' => 'Det finns inga kolumndefinitioner för :columns',
+        'missing_columns' => 'Listan som används i :class har inga listkolumner definerade',
+        'missing_definition' => "Listegenskapen saknar en kolumn för ':field'",
+        'behavior_not_ready' => 'Listegenskapen har inte blivit initierad, kontrollera att du har anropat makeLists() i din controller',
+    ],
+    'form' => [
+        'create_title' => "Ny :name",
+        'update_title' => "Redigera :name",
+        'preview_title' => "Förhandsgranska :name",
+        'create_success' => ':name är nu skapad',
+        'update_success' => ':name har blivit uppdaterad',
+        'delete_success' => ':name kunde ej raderas',
+        'missing_id' => "Record ID för formuläret har ej blivit specificerat",
+        'missing_model' => 'Formuläregenskapen som används i :class har ingen modell definierad',
+        'missing_definition' => "Formuläregenskapen saknar ett fält för ':field'",
+        'not_found' => 'Record ID :id för formuläret kunde ej hittas',
+        'save' => 'Spara',
+        'save_and_close' => 'Spara och stäng',
+        'saving' => 'Sparar...',
+        'undefined_tab' => 'Övrigt',
+        'field_off' => 'Av',
+        'field_on' => 'På',
+        'apply' => 'Spara',
+        'cancel' => 'Avbryt',
+        'close' => 'Stäng',
+        'delete' => 'Radera',
+        'ok' => 'OK',
+        'confirm_tab_close' => 'Vill du verkligen stänga fliken? Ej sparade ändringar kommer gå förlorade',
+        'behavior_not_ready' => 'Formuläregenskap har ej blivit initierad, kontrollera att du anropat initForm() i din controller',
+    ],
+    'relation' => [
+        'missing_definition' => "Relationen saknar en definintion för ':field'",
+        'missing_model' => "Relationen som används i :class har ingen modell definierad",
+        'invalid_action_single' => "Den här åtgärden kan inte appliceras på en enskild relation",
+        'invalid_action_multi' => "Denna åtgärd kan inte appliceras på flera relationer",
+        'add' => "Lägg till",
+        'add_name' => "Lägg till :name",
+        'create' => "Skapa",
+        'create_name' => "Skapa :name",
+        'remove' => "Ta bort",
+        'remove_name' => "Ta bort :name",
+        'delete' => "Radera",
+        'delete_name' => "Radera :name",
+    ],
+    'model' => [
+        'name' => "Modell",
+        'not_found' => "Modellen ':class' med ID :id kunde ej hittas",
+        'missing_id' => "Det finns inget ID anviget för modellen",
+        'missing_relation' => "Modellen ':class' saknar en definition för ':relation'",
+        'invalid_class' => "Modellen :model i klass :class är ej giltig. Den måste ärva från \Model-klassen",
+    ],
+];
\ No newline at end of file
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
new file mode 100644
index 000000000..65e54823a
--- /dev/null
+++ b/modules/cms/lang/sv/lang.php
@@ -0,0 +1,132 @@
+<?php
+
+return [
+    'cms_object' => [
+        'invalid_file' => 'Felaktigt filnamn: :name. Filnamn kan endast innehålla alfanumeriska tecken, understreck, streck och punkter. Några exempel på korrekta filnamn är: sida.htm, sida, undermapp/sida',
+        'invalid_property' => 'Egenskapen ":name" kunde inte sättas',
+        'file_already_exists' => 'Filen ":name" finns redan',
+        'error_saving' => 'Ett fel inträffade när ":name" skulle sparas',
+        'error_creating_directory' => 'Ett fel inträffade när mappen :name skulle skapas',
+        'invalid_file_extension'=>'Felaktig filändelse: :invalid. Tillåtna filändelser är: :allowed.',
+        'error_deleting' => 'Det gick inte att radera mallfilen: ":name".',
+        'delete_success' => 'Mallarna är nu raderade: :count.',
+        'file_name_required' => 'Filnamnsfältet är obligatoriskt.'
+    ],
+    'theme' => [
+        'active' => [
+            'not_set' => "Ett aktivt tema är ej satt",
+        ],
+        'edit' => [
+            'not_set' => "Redigeringstemat är ej satt",
+            'not_found' => "Redigeringstemat kunde ej hittas",
+            'not_match' => "Objketet du försöker komma åt tillhör inte det tema som för håller på att redigeras. Var god ladda om sidan",
+        ]
+    ],
+    'page' => [
+        'not_found' => [
+            'label' => "Sidan kunde ej hittas",
+            'help' => "Den begärda sidan kunde ej hittas",
+        ],
+        'custom_error' => [
+            'label' => "Sidfel",
+            'help' => "Tyvärr kan inte sidan visas",
+        ],
+        'menu_label' => 'Sidor',
+        'no_list_records' => 'Inga sidor funna',
+        'new' => 'Ny sida',
+        'invalid_url' => 'Felaktigt URL-format. URLen skall starta med ett / och kan innehålla siffror, bokstäver och följande tecken: _-[]:?|/+*',
+        'delete_confirm_multiple' => 'Vill du verkligen radera markerade sidor?',
+        'delete_confirm_single' => 'Vill du verkligen radera denna sida?',
+        'no_layout' => '-- ingen layout --'
+    ],
+    'layout' => [
+        'not_found' => "Layouten ':name' hittades ej",
+        'menu_label' => 'Layouter',
+        'no_list_records' => 'Inga layouter funna',
+        'new' => 'Ny layout',
+        'delete_confirm_multiple' => 'Vill du verkligen radera valda layouter?',
+        'delete_confirm_single' => 'Vill du verkligen radera denna layouter?'
+    ],
+    'partial' => [
+        'invalid_name' => "Felaktigt partialnamn: :name",
+        'not_found' => "En partial med namnet ':name' kunde ej hittas",
+        'menu_label' => 'Partials',
+        'no_list_records' => 'Inga partials funna',
+        'delete_confirm_multiple' => 'Vill du verkligen radera markerade partials?',
+        'delete_confirm_single' => 'Vill du verkligen radera denna partial?',
+        'new' => 'Ny partial'
+    ],
+    'content' => [
+        'not_found' => "Content-filen ':name' kunde ej hittas",
+        'menu_label' => 'Content',
+        'no_list_records' => 'Inga content-filer funna',
+        'delete_confirm_multiple' => 'Vill du verkligen radera markerade filer eller mappar?',
+        'delete_confirm_single' => 'Vill du verkligen radera denna content-fil?',
+        'new' => 'Ny content-fil'
+    ],
+    'ajax_handler' => [
+        'invalid_name' => "Felaktig AJAX-hanterare: :name",
+        'not_found' => "AJAX-hanterare ':name' kunde ej hittas",
+    ],
+    'combiner' => [
+        'not_found' => "Kombinationsfilen ':name' kunde ej hittas",
+    ],
+    'cms' => [
+        'menu_label' => "CMS"
+    ],
+    'asset' => [
+        'menu_label' => "Assets",
+        'drop_down_add_title' => 'Lägg till...',
+        'drop_down_operation_title' => 'Åtgärd...',
+        'upload_files' => 'Ladda upp fil(er)',
+        'create_file' => 'Skapa fil',
+        'create_directory' => 'Skapa mapp',
+        'rename' => 'Döp om',
+        'delete' => 'Radera',
+        'move' => 'Flytta',
+        'new' => 'Ny fil',
+        'rename_popup_title' => 'Byt namn',
+        'rename_new_name' => 'Nytt namn',
+        'invalid_path' => 'Sökvägen kan endast innehålla siffror, bokstäver, mellanslag och följande tecken: ._-/',
+        'error_deleting_file' => 'Kunde inte radera filen :name.',
+        'error_deleting_dir_not_empty' => 'Ett fel uppstod vid försök att radera :name. Mappen är ej tom',
+        'error_deleting_dir' => 'Kunde inte radera filen :name.',
+        'invalid_name' => 'Namn kan endast innehålla siffror, bokstäver, mellanslag och följande tecken: ._-',
+        'original_not_found' => 'Orginalfilen eller mappen kunde ej hittas',
+        'already_exists' => 'En fil eller mapp med detta namn finns redan',
+        'error_renaming' => 'Ett fel uppstod vid namnbyte på filen eller mappen',
+        'name_cant_be_empty' => 'Namn får ej vara tomt',
+        'too_large' => 'Den uppladdade filen är för stor. Tillåten filstorlek är :max_size',
+        'type_not_allowed' => 'Endast följande filtyper är tillåtna: :allowed_types',
+        'file_not_valid' => 'Filen är inte korrekt',
+        'error_uploading_file' => 'Ett fel uppstod vid uppladdning av ":name" :error',
+        'move_please_select' => 'Var god välj',
+        'move_destination' => 'Destionationsmapp',
+        'move_popup_title' => 'Flytta assets',
+        'move_button' => 'Flytta',
+        'selected_files_not_found' => 'Valda filer kunde ej hittas',
+        'select_destination_dir' => 'Var god välj en destinationsmapp',
+        'destination_not_found' => 'Destinationsmappen kunde ej hittas',
+        'error_moving_file' => 'Ett fel uppstod vid flytt av fil :file',
+        'error_moving_directory' => 'Ett fel uppstod vid flytt av mapp :dir',
+        'error_deleting_directory' => 'Ett fel uppstod vid radering av orginalmapp :dir',
+        'path' => 'Sökväg'
+    ],
+    'component' => [
+        'menu_label' => "Komponent",
+        'unnamed' => "Ej namngiven",
+        'no_description' => "Ingen beskrivning",
+        'alias' => "Alias",
+        'alias_description' => "Ett unikt namn för denna komponent, när den skall användas i sid- eller layoutkod",
+        'validation_message' => "Komponentalias är obligatoriska och får endast innehålla bokstäver, siffror, och understreck. De måste börja med en bokstav",
+        'invalid_request' => "Mallen kunde inte sparas pga felaktig komponentdata",
+        'no_records' => 'Inga komponenter funna',
+        'not_found' => "Komponenten ':name' kunde ej hittas",
+        'method_not_found' => "Komponenten ':name' saknar metoden ':method'",
+    ],
+    'template' => [
+        'invalid_type' => "Felaktig malltyp",
+        'not_found' => "Den angivna mallen kunde ej hittas",
+        'saved'=> "Mallen har sparats"
+    ]
+];
\ No newline at end of file
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
new file mode 100644
index 000000000..2922d222d
--- /dev/null
+++ b/modules/system/lang/sv/lang.php
@@ -0,0 +1,96 @@
+<?php
+
+return [
+    'app' => [
+        'name' => 'October CMS',
+        'motto' => 'Getting back to basics',
+    ],
+    'directory' => [
+        'create_fail' => "Kunde inte skapa mapp: :name",
+    ],
+    'file' => [
+        'create_fail' => "Kunde inte skapa fil: :name",
+    ],
+    'system' => [
+        'name' => 'System',
+        'menu_label' => 'System',
+    ],
+    'plugin' => [
+        'unnamed' => 'Namnlöst plugin',
+        'name' => [
+            'label' => 'Plugin-namn',
+            'help' => 'Namnge pluginet efter dess unika kod. Exempelvis RainLab.Blog',
+        ],
+    ],
+    'project' => [
+        'name' => 'Projekt',
+        'owner_label' => 'Ägare',
+        'id' => [
+            'label' => 'Projekt-ID',
+            'help' => 'Hur du hittar ditt Projekt-ID',
+            'missing' => 'Var god välj ett Projekt-ID',
+        ],
+        'unbind_success' => 'Projektet har blivit avlänkat',
+    ],
+    'settings' => [
+        'menu_label' => 'Inställningar',
+        'missing_model' => 'Inställningssidan saknar en modell-definition',
+        'update_success' => 'Inställningar för :name har uppdaterats',
+    ],
+    'install' => [
+        'project_label' => 'Länka till Projekt',
+        'plugin_label' => 'Installera Plugin',
+        'missing_plugin_name' => 'Välj ett plugin-namn att installera',
+        'install_completing' => 'Installationen är klar',
+        'install_success' => 'Pluginet har installerats',
+    ],
+    'updates' => [
+        'name' => 'Uppdatera mjukvara',
+        'menu_label' => 'Uppdateringar',
+        'check_label' => 'Kontrollera uppdateringar',
+        'retry_label' => 'Försök igen',
+        'core_build' => 'Nuvarande build',
+        'core_build_old' => 'Nuvarande build :build',
+        'core_build_new' => 'Build :build',
+        'core_build_new_help' => 'Senaste build är tillgänglig.',
+        'core_downloading' => 'Laddar ner applikationsfiler',
+        'core_extracting' => 'Packar upp applikationsfiler',
+        'plugin_downloading' => 'Laddar ner plugin: :name',
+        'plugin_extracting' => 'Packar upp plugin: :name',
+        'plugin_version_none' => 'Nytt plugin',
+        'plugin_version_old' => 'Nuvarande v:version',
+        'plugin_version_new' => 'v:version',
+        'update_label' => 'Updatera mjukvara',
+        'update_completing' => 'Slutför uppdatering',
+        'update_loading' => 'Laddar tillgängliga uppdateringar...',
+        'update_success' => 'Uppdateringen är slutförd.',
+        'update_failed_label' => 'Updateringen misslyckades',
+        'force_label' => 'Tvinga uppdatering',
+        'found' => [
+            'label' => 'Hittade nya uppdateringar!',
+            'help' => 'Klicka på Uppdatera mjukvara för att påbörja uppdateringen.',
+        ],
+        'none' => [
+            'label' => 'Inga uppdateringar',
+            'help' => 'Inga nya uppdateringar hittades.',
+        ],
+    ],
+    'server' => [
+        'connect_error' => 'Ett fel uppstod vid anslutning till servern.',
+        'response_not_found' => 'Uppdateringsserver kunde ej hittas.',
+        'response_invalid' => 'Felaktigt svar från servern.',
+        'response_empty' => 'Tomt svar från servern.',
+        'file_error' => 'Servern kunde inte leverera paketet.',
+        'file_corrupt' => 'Filen från servern är korrupt.',
+    ],
+    'behavior' => [
+        'missing_property' => 'Klassen :class måste definera egenskapen $:property som används av :behavior -egenskapen',
+    ],
+    'config' => [
+        'not_found' => 'Kunde inte hitta konfigurationsfilen :file definerad för :location',
+        'required' => 'Konfigurationen som används i :location måste sända med ett värde :property',
+    ],
+    'zip' => [
+        'extract_failed' => "Kunde inte packa upp core-fil ':file'.",
+    ],
+];
\ No newline at end of file
diff --git a/modules/system/lang/sv/validation.php b/modules/system/lang/sv/validation.php
new file mode 100644
index 000000000..66a7d4459
--- /dev/null
+++ b/modules/system/lang/sv/validation.php
@@ -0,0 +1,98 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => ":attribute måste accepteras.",
+    "active_url"       => ":attribute är ej en korrekt URL.",
+    "after"            => ":attribute måste vara ett datum efter :date.",
+    "alpha"            => ":attribute får endast innehålla bokstäver.",
+    "alpha_dash"       => ":attribute får endast innehålla bokstäver, nummer och streck.",
+    "alpha_num"        => ":attribute får endast innehålla bokstäver och nummer",
+    "array"            => ":attribute måste vara en array.",
+    "before"           => ":attribute måste vara ett datum innan :date.",
+    "between"          => array(
+        "numeric" => ":attribute måste vara mellan :min - :max.",
+        "file"    => ":attribute måste vara mellan :min - :max kilobytes.",
+        "string"  => ":attribute måste vara mellan :min - :max tecken.",
+        "array"   => ":attribute måste ha mellan :min - :max objekt.",
+    ),
+    "confirmed"        => ":attribute bekräftelse matchar ej.",
+    "date"             => ":attribute är inte ett korrekt datum.",
+    "date_format"      => ":attribute matchar inte formatet :format.",
+    "different"        => ":attribute och :other måste skilja sig åt.",
+    "digits"           => ":attribute måste vara :digits siffror.",
+    "digits_between"   => ":attribute måste vara between :min and :max siffror.",
+    "email"            => ":attribute format är felaktigt.",
+    "exists"           => "Valt :attribute är felaktigt.",
+    "image"            => ":attribute måste vara en bild.",
+    "in"               => "Valt :attribute är felaktigt.",
+    "integer"          => ":attribute måste vara en siffra.",
+    "ip"               => ":attribute måste vara en giltig epost-adress.",
+    "max"              => array(
+        "numeric" => ":attribute får inte vara större än :max.",
+        "file"    => ":attribute får inte vara större än :max kilobytes.",
+        "string"  => ":attribute får inte vara större än :max tecken.",
+        "array"   => ":attribute får inte innehålla mer än :max objekt.",
+    ),
+    "mimes"            => ":attribute måste vara en fil av typen: :values.",
+    "min"              => array(
+        "numeric" => ":attribute måste vara minst :min.",
+        "file"    => ":attribute måste vara minst :min kilobytes.",
+        "string"  => ":attribute måste vara minst :min tecken.",
+        "array"   => ":attribute måste ha minst :min objekt.",
+    ),
+    "not_in"           => "Valt :attribute är felaktigt.",
+    "numeric"          => ":attribute måste vara ett number.",
+    "regex"            => ":attribute format är felaktigt.",
+    "required"         => ":attribute field är obligatoriskt.",
+    "required_if"      => ":attribute field är obligatoriskt när :other is :value.",
+    "required_with"    => ":attribute field är obligatoriskt när :values är satt.",
+    "required_without" => ":attribute field är obligatoriskt när :values ej är satt.",
+    "same"             => ":attribute and :other måste matcha.",
+    "size"             => array(
+        "numeric" => ":attribute måste vara :size.",
+        "file"    => ":attribute måste vara :size kilobytes.",
+        "string"  => ":attribute måste vara :size tecken.",
+        "array"   => ":attribute måste innehålla :size objekt.",
+    ),
+    "unique"           => ":attribute är redan upptaget.",
+    "url"              => "Formatet :attribute är felaktigt.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);

From 2883fa6b6a98ee3e57ba3cb3f9fe1a19a554f3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=CC=88r=20Karlsson?= <me@iamacoder.com>
Date: Thu, 15 May 2014 15:18:07 +0200
Subject: [PATCH 08/24] Fixed typo in english language file

---
 modules/cms/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 4f5a0ffc4..7f61525e1 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -5,7 +5,7 @@ return [
         'invalid_file' => 'Invalid file name: :name. File names can contain only alphanumeric symbols, underscores, dashes and dots. Some examples of correct file names: page.htm, page, subdirectory/page',
         'invalid_property' => 'The property ":name" cannot be set',
         'file_already_exists' => 'File ":name" already exists.',
-        'error_saving' => 'Eror saving file ":name".',
+        'error_saving' => 'Error saving file ":name".',
         'error_creating_directory' => 'Error creating directory :name',
         'invalid_file_extension'=>'Invalid file extension: :invalid. Allowed extensions are: :allowed.',
         'error_deleting' => 'Error deleting the template file ":name".',

From ef2ea600611fcc33436b6a518a151fe4afbc22c0 Mon Sep 17 00:00:00 2001
From: alxy <alexander@familie-guth.com>
Date: Thu, 15 May 2014 15:48:14 +0200
Subject: [PATCH 09/24] Add $attributes param to asset function

This commit adds a second parameter $attributes to the following functions:

- AssetMaker::addJs
- AssetMaker::addCss
- AssetMaker::addRss

This is useful when dealing with javascript libraries like require.js, which depend on these HTML attributes to function properly.

It does not break the existing code!
---
 modules/system/traits/AssetMaker.php | 66 ++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index b21012c60..b05b3cd4e 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -2,6 +2,7 @@
 
 use File;
 use Request;
+use HTML;
 use System\Classes\SystemException;
 
 /**
@@ -36,18 +37,43 @@ trait AssetMaker
         $result = null;
 
         if ($type == null || $type == 'css'){
-            foreach ($this->assets['css'] as $file)
-                $result .= '<link rel="stylesheet" href="'.$file.'">' . PHP_EOL;
+            foreach ($this->assets['css'] as $asset) {
+                $attributes = HTML::attributes(array_merge(
+                    [
+                        'rel' => 'stylesheet',
+                        'href' => $asset['path']
+                    ],
+                    $asset['attributes'])
+                );
+                $result .= '<link' . $attributes . '>' . PHP_EOL;
+            }
         }
 
         if ($type == null || $type == 'rss'){
-            foreach ($this->assets['rss'] as $file)
-                $result .= '<link title="RSS" rel="alternate" href="'.$file.'" type="application/rss+xml"/>' . PHP_EOL;
+            foreach ($this->assets['rss'] as $asset) {
+                $attributes = HTML::attributes(array_merge(
+                    [
+                        'rel' => 'alternate',
+                        'href' => $asset['path'],
+                        'title' => 'RSS',
+                        'type' => 'application/rss+xml'
+                    ],
+                    $asset['attributes'])
+                );
+                $result .= '<link' . $attributes . '>' . PHP_EOL;
+            }
         }
 
         if ($type == null || $type == 'js') {
-            foreach ($this->assets['js'] as $file)
-                $result .= '<script src="'.$file.'"></script>' . PHP_EOL;
+            foreach ($this->assets['js'] as $asset) {
+                $attributes = HTML::attributes(array_merge(
+                    [
+                        'src' => $asset['path']
+                    ],
+                    $asset['attributes'])
+                );
+                $result .= '<script' . $attributes . '></script>' . PHP_EOL;
+            }
         }
 
         return $result;
@@ -57,29 +83,34 @@ trait AssetMaker
      * Adds JavaScript asset to the asset list. Call $this->makeAssets() in a view 
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the script.
+     * @param array $attributes Adds HTML attributes to the asset link.
      * @return void
      */
-    public function addJs($name)
+    public function addJs($name, $attributes = [])
     {
         $jsPath = $this->getAssetPath($name);
 
         if (isset($this->controller))
-            $this->controller->addJs($jsPath);
+            $this->controller->addJs($jsPath, $attributes);
 
         if (substr($jsPath, 0, 1) == '/')
             $jsPath = Request::getBaseUrl() . $jsPath;
 
         if (!in_array($jsPath, $this->assets['js']))
-            $this->assets['js'][] = $jsPath;
+            $this->assets['js'][] = [
+                'path' => $jsPath,
+                'attributes' => $attributes
+            ];
     }
 
     /**
      * Adds StyleSheet asset to the asset list. Call $this->makeAssets() in a view
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the script.
+     * @param array $attributes Adds HTML attributes to the asset link.
      * @return void
      */
-    public function addCss($name)
+    public function addCss($name, $attributes = [])
     {
         $cssPath = $this->getAssetPath($name);
 
@@ -90,16 +121,20 @@ trait AssetMaker
             $cssPath = Request::getBaseUrl() . $cssPath;
 
         if (!in_array($cssPath, $this->assets['css']))
-            $this->assets['css'][] = $cssPath;
+            $this->assets['css'][] = [
+                'path' => $cssPath,
+                'attributes' => $attributes
+            ];
     }
 
     /**
      * Adds an RSS link asset to the asset list. Call $this->makeAssets() in a view
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the RSS channel
+     * @param array $attributes Adds HTML attributes to the asset link.
      * @return void
      */
-    public function addRss($name)
+    public function addRss($name, $attributes = [])
     {
         $rssPath = $this->getAssetPath($name);
 
@@ -110,7 +145,10 @@ trait AssetMaker
             $rssPath = Request::getBaseUrl() . $rssPath;
 
         if (!in_array($rssPath, $this->assets['rss']))
-            $this->assets['rss'][] = $rssPath;
+            $this->assets['rss'][] = [
+                'path' => $rssPath,
+                'attributes' => $attributes
+            ];
     }
 
     /**
@@ -150,4 +188,4 @@ trait AssetMaker
         return count($this->assets, COUNT_RECURSIVE) > 3;
     }
 
-}
\ No newline at end of file
+}

From dc2b23fcee6b0db29ca9bbaacc570780052e06a6 Mon Sep 17 00:00:00 2001
From: leranus <leranus@users.noreply.github.com>
Date: Thu, 15 May 2014 17:03:11 +0200
Subject: [PATCH 10/24] Update README.md

Adjust Laravel link so it works
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5caab8032..6b56fb062 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Please follow the following guides and code standards:
 
 ### Foundation library
 
-The CMS uses [Laravel](http://four.laravel.com) as a foundation PHP framework.
+The CMS uses [Laravel](http://laravel.com) as a foundation PHP framework.
 
 ### Contact
 

From 23d98e5caf129b6d8e1ee1bc19adff9ead82c8d1 Mon Sep 17 00:00:00 2001
From: mhe <mail@marcus-herrmann.com>
Date: Thu, 15 May 2014 17:27:47 +0200
Subject: [PATCH 11/24] Added German language files

---
 modules/backend/lang/de/lang.php | 128 +++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 modules/backend/lang/de/lang.php

diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
new file mode 100644
index 000000000..e6cb11bd8
--- /dev/null
+++ b/modules/backend/lang/de/lang.php
@@ -0,0 +1,128 @@
+<?php
+
+return [
+    'field' => [
+        'invalid_type' => 'Ungültiger Feldtyp :type.',
+        'options_method_not_exists' => 'Die Model-Klasse :model muss eine Methode :method() mit Rückgabe der Werte von ":field" besitzen.',
+    ],
+    'widget' => [
+        'not_registered' => "Ein Widget namens ':name' wurde nicht registriert",
+        'not_bound' => "Ein Widget mit dem Klassennamen ':name' wurde nicht mit dem Controller verbunden",
+    ],
+    'page' => [
+        'untitled' => "Unbenannt",
+    ],
+    'partial' => [
+        'not_found' => "Das Partial ':name' wurde nicht gefunden.",
+    ],
+    'account' => [
+        'sign_out' => 'Abmelden',
+        'login' => 'Anmelden',
+        'reset' => 'Zurücksetzen',
+        'restore' => 'Wiederherstellen',
+        'login_placeholder' => 'Benutzername',
+        'password_placeholder' => 'Passwort',
+        'forgot_password' => "Passwort vergessen?",
+        'enter_email' => "Bitte E-Mail-Adresse eingeben",
+        'enter_login' => "Bitte Benutzernamen eingeben",
+        'email_placeholder' => "E-Mail",
+        'enter_new_password' => "Bitte ein neues Passwort eingeben",
+        'password_reset' => "Passwort zurücksetzen",
+        'restore_success' => "Eine E-Mail mit weiteren Anweisungen zum Zurücksetzen Ihres Passworts wurde an Sie versandt",
+        'restore_error' => "Ein Benutzer mit dem Namen ':login' wurde nicht gefunden",
+        'reset_success' => "Ihr Passwort wurde erfolgreich zurückgesetzt. Sie können sich jetzt anmelden.",
+        'reset_error' => "Konnte Passwort nicht zurücksetzen. Bitte erneut versuchen!",
+        'reset_fail' => "Passwort-Zurücksetzung nicht möglich!",
+        'apply' => 'Anwenden',
+        'cancel' => 'Abbrechen',
+        'delete' => 'Löschen',
+        'ok' => 'OK',
+    ],
+    'dashboard' => [
+        'menu_label' => 'Dashboard',
+    ],
+    'user' => [
+        'name' => 'Administrator',
+        'menu_label' => 'Administratoren',
+        'list_title' => 'Administratoren verwalten',
+        'login' => "Anmelden",
+        'first_name' => "Vorname",
+        'last_name' => "Nachname",
+        'full_name' => "Kompletter Name",
+        'email' => "E-Mail",
+        'groups' => "Gruppen",
+        'groups_comment' => "Geben Sie hier die Gruppenzugehörigkeit an",
+        'avatar' => "Avatar",
+        'password' => "Passwort",
+        'password_confirmation' => "Passwort bestätigen",
+        'superuser' => "Super User",
+        'superuser_comment' => "Bestätigen Sie hier, um dem Nutzer Vollzugriff zu geben",
+        'send_invite' => 'Einladung per E-Mail versenden',
+        'send_invite_comment' => 'Hier bestätigen, dass eine Einladung per E-Mail erfolgt',
+        'group' => [
+            'name' => 'Gruppe',
+            'name_field' => 'Name',
+            'menu_label' => 'Gruppen',
+            'list_title' => 'Gruppen verwalten',
+        ],
+        'preferences' => [
+            'not_authenticated' => 'Zum Speichern oder Anzeigen dieser Einstellungen liegt kein Nutzerkonto vor'
+        ]
+    ],
+    'list' => [
+        'default_title' => 'Auflisten',
+        'search_prompt' => 'Suchen...',
+        'no_records' => 'Keine Ergebnisse für diese Ansicht gefunden',
+        'missing_model' => 'In :class benutztes Lisstenverhalten hat kein Model definiert.',
+        'missing_column' => 'Keine Spaltendefinition für :columns.',
+        'missing_columns' => 'In :class benutzte Liste behinhaltet keine Spalten',
+        'missing_definition' => "Der Liste fehlt eine Spalte für ':field'.",
+        'behavior_not_ready' => 'Listenverhalten kann nicht initialisiert werden, überprüfen Sie den Aufruf von makeLists() in Ihrem Controller.',
+    ],
+    'form' => [
+        'create_title' => "Neuer :name",
+        'update_title' => "Bearbeite :name",
+        'preview_title' => "Vorschau für :name",
+        'create_success' => ':name wurde erfolgreich erzeugt',
+        'update_success' => ':name wurde erfolgreich aktualisiert',
+        'delete_success' => ':name wurde erfolgreich gelöscht',
+        'missing_id' => "Formulardatensatz-ID (Form record ID) fehlt.",
+        'missing_model' => 'In :class genutztes Formularverhalten (behaviour) hat kein definiertes Model',
+        'missing_definition' => "Formverhalten fehlt ein Feld für ':field'.",
+        'not_found' => 'Formulareintrag mit der ID :id kann nicht gefunden werden.',
+        'save' => 'Speichern',
+        'save_and_close' => 'Speichern und schließen',
+        'saving' => 'Wird gespeichert...',
+        'undefined_tab' => 'Divers',
+        'field_off' => 'Aus',
+        'field_on' => 'An',
+        'apply' => 'Anwenden',
+        'cancel' => 'Abbrechen',
+        'close' => 'Schließen',
+        'delete' => 'Löschen',
+        'ok' => 'OK',
+        'confirm_tab_close' => 'Wollen Sie den Tab wirklich schließen? Ungespeicherte Änderungen gehen verloren.',
+        'behavior_not_ready' => 'Formularverhalten kann nicht initialisiert werden, überprüfen Sie den Aufruf von makeLists() in Ihrem Controller.',
+    ],
+    'relation' => [
+        'missing_definition' => "Verhalten (behaviour) der Verbindung umfasst keine Definition für ':field'.",
+        'missing_model' => "Verhalten (behaviour) der Verbindung, die in :class benutzt wird, hat kein definiertes Model",
+        'invalid_action_single' => "Dieser Vorgang kann nicht auf eine Einwege-Verbindung (singular) angewendet werden.",
+        'invalid_action_multi' => "Dieser Vorgang kann nicht auf eine Mehrwege-Verbindung (multiple) angewendet werden.",
+        'add' => "Hinzufügen",
+        'add_name' => ":name hinzufügen",
+        'create' => "Erstellen",
+        'create_name' => "Erstelle :name",
+        'remove' => "Entfernen",
+        'remove_name' => ":name entfernen",
+        'delete' => "Löschen",
+        'delete_name' => ":name löschen",
+    ],
+    'model' => [
+        'name' => "Model",
+        'not_found' => "Model ':class' mit ID :id konnte nicht gefunden werden",
+        'missing_id' => "Für diesen Model-Datensatz ist keine ID angegeben",
+        'missing_relation' => "Model ':class' hat keine definierte Verbindung ':relation'.",
+        'invalid_class' => "In :class benutztes Model :model ist ungültig, da es von der Klasse \Model abgeleitet sein muss (inherit).",
+    ],
+];
\ No newline at end of file

From ce2db60a8aa5939e468aa1dd9ae89e5510a0fb51 Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Thu, 15 May 2014 12:21:16 -0400
Subject: [PATCH 12/24] Change demo page routes to /demo/{page}

---
 themes/demo/pages/ajax.htm    | 4 ++--
 themes/demo/pages/plugins.htm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/demo/pages/ajax.htm b/themes/demo/pages/ajax.htm
index f63e3cc7b..620af4daf 100644
--- a/themes/demo/pages/ajax.htm
+++ b/themes/demo/pages/ajax.htm
@@ -1,5 +1,5 @@
 title = "AJAX framework"
-url = "/ajax"
+url = "/demo/ajax"
 layout = "default"
 ==
 <?php
@@ -64,4 +64,4 @@ function onTest()
 </div>
 
 <!-- Page Explanation -->
-<div class="container">{% partial "explain/ajax.htm" %}</div>
\ No newline at end of file
+<div class="container">{% partial "explain/ajax.htm" %}</div>
diff --git a/themes/demo/pages/plugins.htm b/themes/demo/pages/plugins.htm
index 73cae0d2a..ac6b8465b 100644
--- a/themes/demo/pages/plugins.htm
+++ b/themes/demo/pages/plugins.htm
@@ -1,5 +1,5 @@
 title = "Plugin components"
-url = "/plugins"
+url = "/demo/plugins"
 layout = "default"
 
 [demoTodo]

From 2e649d6b5fd3757a35a78ab6d386ace3e2db20a0 Mon Sep 17 00:00:00 2001
From: Jasper <me@jspr.cc>
Date: Thu, 15 May 2014 19:36:04 +0200
Subject: [PATCH 13/24] Moved hard-coded text to language file (backend)

Hard-coded text from the backend (user- and group management) moved to
the language file (English and Dutch).
---
 .../controllers/groups/_list_toolbar.htm       |  2 +-
 modules/backend/controllers/groups/create.htm  | 14 +++++++-------
 modules/backend/controllers/groups/index.htm   |  6 +++---
 modules/backend/controllers/groups/update.htm  | 18 +++++++++---------
 .../controllers/users/_list_toolbar.htm        |  4 ++--
 modules/backend/controllers/users/create.htm   | 14 +++++++-------
 .../backend/controllers/users/mysettings.htm   | 12 ++++++------
 modules/backend/controllers/users/update.htm   | 18 +++++++++---------
 modules/backend/lang/en/lang.php               | 14 ++++++++++++++
 modules/backend/lang/nl/lang.php               | 16 +++++++++++++++-
 10 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/modules/backend/controllers/groups/_list_toolbar.htm b/modules/backend/controllers/groups/_list_toolbar.htm
index adf5fa8e7..5a25508df 100644
--- a/modules/backend/controllers/groups/_list_toolbar.htm
+++ b/modules/backend/controllers/groups/_list_toolbar.htm
@@ -1,3 +1,3 @@
 <div data-control="toolbar">
-    <a href="<?= Backend::url('backend/groups/create') ?>" class="btn btn-primary oc-icon-plus">New Admin Group</a>
+    <a href="<?= Backend::url('backend/groups/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.user.group.new')) ?></a>
 </div>
diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm
index 96b5a6141..11515d3bc 100644
--- a/modules/backend/controllers/groups/create.htm
+++ b/modules/backend/controllers/groups/create.htm
@@ -1,7 +1,7 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
-        <li><a href="<?= Backend::url('backend/groups') ?>">Manage Groups</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
+        <li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -19,9 +19,9 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Creating Group..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
                     class="btn btn-primary">
-                    Create
+                    <?= e(trans('backend::lang.form.create')) ?>
                 </button>
                 <button 
                     type="button"
@@ -29,9 +29,9 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Creating Group..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
                     class="btn btn-default">
-                    Create and Close
+                    <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
             </div>
         </div>
@@ -40,5 +40,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default">Return to the group list</a></p>
+    <p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/groups/index.htm b/modules/backend/controllers/groups/index.htm
index 04b0f32ae..c3dccaf27 100644
--- a/modules/backend/controllers/groups/index.htm
+++ b/modules/backend/controllers/groups/index.htm
@@ -1,8 +1,8 @@
-<div class="control-breadcrumb">
+<?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
-</div>
+<?php Block::endPut() ?>
 
 <?= $this->listRender() ?>
diff --git a/modules/backend/controllers/groups/update.htm b/modules/backend/controllers/groups/update.htm
index 63126567d..fc1b99ed2 100644
--- a/modules/backend/controllers/groups/update.htm
+++ b/modules/backend/controllers/groups/update.htm
@@ -1,7 +1,7 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
-        <li><a href="<?= Backend::url('backend/groups') ?>">Manage Groups</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
+        <li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -20,9 +20,9 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Saving Group..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave
+                    <?= e(trans('backend::lang.form.save')) ?>
                 </button>
                 <button
                     type="button"
@@ -30,17 +30,17 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="Saving Group..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
                     class="btn btn-default">
-                    Save and Close
+                    <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
                 <button
                     type="button"
                     class="btn btn-danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="Deleting Group..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.group.deleting')) ?>"
                     data-request-confirm="Do you really want to delete this admin?">
-                    Delete
+                    <?= e(trans('backend::lang.form.delete')) ?>
                 </button>
             </div>
         </div>
@@ -49,5 +49,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default">Return to the group list</a></p>
+    <p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/_list_toolbar.htm b/modules/backend/controllers/users/_list_toolbar.htm
index ab2166728..3563ce7ed 100644
--- a/modules/backend/controllers/users/_list_toolbar.htm
+++ b/modules/backend/controllers/users/_list_toolbar.htm
@@ -1,6 +1,6 @@
 <div data-control="toolbar">
-    <a href="<?= Backend::url('backend/users/create') ?>" class="btn btn-primary oc-icon-plus">New Admin</a>
-    <a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default oc-icon-group">Manage Groups</a>
+    <a href="<?= Backend::url('backend/users/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.user.new')) ?></a>
+    <a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default oc-icon-group"><?= e(trans('backend::lang.user.group.list_title')) ?></a>
     <?php /* @todo
     <div class="btn-group">
         <button
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index ea0ac1be8..07d629402 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -19,9 +19,9 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Creating Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
                     class="btn btn-primary">
-                    Create
+                    <?= e(trans('backend::lang.form.create')) ?>
                 </button>
                 <button
                     type="button"
@@ -29,12 +29,12 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="Creating Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
                     class="btn btn-default">
-                    Create and Close
+                    <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('backend/users') ?>">Cancel</a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
             </div>
         </div>
@@ -57,6 +57,6 @@
             <?= Block::placeholder('breadcrumb') ?>
         </div>
         <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
+        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
     </div>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/mysettings.htm b/modules/backend/controllers/users/mysettings.htm
index 15d42c366..e303b1f5f 100644
--- a/modules/backend/controllers/users/mysettings.htm
+++ b/modules/backend/controllers/users/mysettings.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -20,9 +20,9 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Saving Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave
+                    <?= e(trans('backend::lang.form.save')) ?>
                 </button>
                 <button
                     type="button"
@@ -30,9 +30,9 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="Saving Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
                     class="btn btn-default">
-                    Save and Close
+                    <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
             </div>
         </div>
@@ -54,6 +54,6 @@
             <?= Block::placeholder('breadcrumb') ?>
         </div>
         <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
+        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
     </div>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index 5d082b9f0..41f053dbd 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
+        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -20,9 +20,9 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Saving Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave
+                    <?= e(trans('backend::lang.form.save')) ?>
                 </button>
                 <button
                     type="button"
@@ -30,19 +30,19 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="Saving Admin..."
+                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
                     class="btn btn-default">
-                    Save and Close
+                    <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('backend/users') ?>">Cancel</a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
                 <button
                     type="button"
                     class="oc-icon-trash-o btn-icon danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="Deleting Admin..."
-                    data-request-confirm="Do you really want to delete this admin?">
+                    data-load-indicator="<?= e(trans('backend::lang.user.deleting')) ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.user.delete_confirm')) ?>">
                 </button>
             </div>
         </div>
@@ -65,6 +65,6 @@
             <?= Block::placeholder('breadcrumb') ?>
         </div>
         <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
+        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
     </div>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 7f1fef0ef..06ad0d334 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -45,6 +45,7 @@ return [
         'name' => 'Administrator',
         'menu_label' => 'Administrators',
         'list_title' => 'Manage Administrators',
+        'new' => 'New Administrator',
         'login' => "Login",
         'first_name' => "First Name",
         'last_name' => "Last Name",
@@ -59,11 +60,21 @@ return [
         'superuser_comment' => "Check this box to allow this person to access all areas.",
         'send_invite' => 'Send invitation by email',
         'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email',
+        'creating' => 'Creating Administrator...',
+        'saving' => 'Saving Administrator...',
+        'deleting' => 'Deleting Administrator...',
+        'delete_confirm' => 'Do you really want to delete this administrator?',
+        'return' => 'Return to the administrator list',
         'group' => [
             'name' => 'Group',
             'name_field' => 'Name',
             'menu_label' => 'Groups',
             'list_title' => 'Manage Groups',
+            'new' => 'New Administrator Group',
+            'creating' => 'Creating Group...',
+            'saving' => 'Saving Group...',
+            'deleting' => 'Deleting Group...',
+            'return' => 'Return to the group list',
         ],
         'preferences' => [
             'not_authenticated' => 'There is no an authenticated user to load or save preferences for.'
@@ -90,6 +101,8 @@ return [
         'missing_model' => 'Form behavior used in :class does not have a model defined.',
         'missing_definition' => "Form behavior does not contain a field for ':field'.",
         'not_found' => 'Form record with an ID of :id could not be found.',
+        'create' => 'Create',
+        'create_and_close' => 'Create and close',
         'save' => 'Save',
         'save_and_close' => 'Save and close',
         'saving' => 'Saving...',
@@ -101,6 +114,7 @@ return [
         'close' => 'Close',
         'delete' => 'Delete',
         'ok' => 'OK',
+        'or' => 'or',
         'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.',
         'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
     ],
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index 5ef91b7ef..54e35f9e8 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -44,7 +44,8 @@ return [
     'user' => [
         'name' => 'Beheerder',
         'menu_label' => 'Beheerders',
-        'list_title' => 'Beheerders beheren',
+        'list_title' => 'Beheer Beheerders',
+        'new' => 'Nieuwe Beheerder',
         'login' => "Gebruikersnaam",
         'first_name' => "Voornaam",
         'last_name' => "Achternaam",
@@ -59,11 +60,21 @@ return [
         'superuser_comment' => "Vink deze optie aan om de gebruiker volledige rechten tot het systeem te geven.",
         'send_invite' => 'Stuur uitnodiging per e-mail',
         'send_invite_comment' => 'Vink deze optie aan om de gebruiker een uitnodiging per e-mail te sturen',
+        'creating' => 'Administrator aanmaken...',
+        'saving' => 'Administrator opslaan...',
+        'deleting' => 'Groep verwijderen...',
+        'delete_confirm' => 'Weet je zeker dat je deze beheerder wilt verwijderen?',
+        'return' => 'Terug naar beheerdersoverzicht',
         'group' => [
             'name' => 'Groep',
             'name_field' => 'Naam',
             'menu_label' => 'Groepen',
             'list_title' => 'Beheer Groepen',
+            'new' => 'Nieuwe Beheerdersgroep',
+            'creating' => 'Groep aanmaken...',
+            'saving' => 'Groep opslaan...',
+            'deleting' => 'Groep verwijderen...',
+            'return' => 'Terug naar groepenoverzicht',
         ],
         'preferences' => [
             'not_authenticated' => 'Er is geen geauthenticeerde gebruiker om gegevens voor te laden of op te slaan.'
@@ -90,6 +101,8 @@ return [
         'missing_model' => 'Geen model opgegeven voor het gedrag (behavior) van het formulier gebruikt in :class.',
         'missing_definition' => "Het gedrag (behavior) van het formulier bevat geen kolom voor ':field'.",
         'not_found' => 'Het formulier met record ID :id is niet gevonden.',
+        'create' => 'Maken',
+        'create_and_close' => 'Maken en sluiten',
         'save' => 'Opslaan',
         'save_and_close' => 'Opslaan en sluiten',
         'saving' => 'Opslaan...',
@@ -101,6 +114,7 @@ return [
         'close' => 'Sluiten',
         'delete' => 'Verwijderen',
         'ok' => 'OK',
+        'or' => 'of',
         'confirm_tab_close' => 'Weet je zeker dat je dit tabblad wilt sluiten? Niet opgeslagen wijzigingen gaan verloren.',
         'behavior_not_ready' => 'Gedrag (behavior) van het formulier is niet geladen. Controleer of initForm() in de controller is aangeroepen.',
     ],

From 80d41c4e4d123c9ff58bbadb1132cfc75e71fa14 Mon Sep 17 00:00:00 2001
From: mhe <mail@marcus-herrmann.com>
Date: Thu, 15 May 2014 20:25:55 +0200
Subject: [PATCH 14/24] Add further translation files

---
 modules/cms/lang/de/lang.php          | 132 ++++++++++++++++++++++++++
 modules/system/lang/de/lang.php       |  96 +++++++++++++++++++
 modules/system/lang/de/validation.php |  98 +++++++++++++++++++
 3 files changed, 326 insertions(+)
 create mode 100644 modules/cms/lang/de/lang.php
 create mode 100644 modules/system/lang/de/lang.php
 create mode 100644 modules/system/lang/de/validation.php

diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
new file mode 100644
index 000000000..c822372dd
--- /dev/null
+++ b/modules/cms/lang/de/lang.php
@@ -0,0 +1,132 @@
+<?php
+
+return [
+    'cms_object' => [
+        'invalid_file' => 'Ungültiger Dateiname: :name. Diese dürfen nur alphanumerische Symbole, Unter- und Bindestriche sowie Punkte enthalten. Beispiele: page.htm, page, subdirectory/page',
+        'invalid_property' => 'Die Eigenschaft ":name" kann nicht angewendet werden',
+        'file_already_exists' => 'Datei ":name" existiert bereits.',
+        'error_saving' => 'Fehler beim Speichern von ":name".',
+        'error_creating_directory' => 'Fehler beim Erstellen von Verzeichnis mit Namen :name',
+        'invalid_file_extension'=>'Ungültige Dateiendung: :invalid. Erlaubt sind: :allowed.',
+        'error_deleting' => 'Fehler beim Löschen der Template-Datei ":name".',
+        'delete_success' => 'Templates wurden erfolgreich gelöscht: :count.',
+        'file_name_required' => 'Ein Dateiname ist erforderlich.'
+    ],
+    'theme' => [
+        'active' => [
+            'not_set' => "Aktives Theme nicht definiert",
+        ],
+        'edit' => [
+            'not_set' => "Edit Theme nicht definiert",
+            'not_found' => "Edit Theme nicht gefunden.",
+            'not_match' => "Das Objekt, das sie anzupassen versuchen gehört nicht zum Theme in Bearbeitung. Bitte laden Sie die Seite erneut."
+        ]
+    ],
+    'page' => [
+        'not_found' => [
+            'label' => "Seite nicht gefunden",
+            'help' => "Die angeforderte Seite kann nicht gefunden werden.",
+        ],
+        'custom_error' => [
+            'label' => "Seitenfehler",
+            'help' => "Entschuldigung, ein Fehler trat auf, sodass die gewünschte Seite nicht angezeigt werden kann.",
+        ],
+        'menu_label' => 'Seiten',
+        'no_list_records' => 'Keine Seiten gefunden',
+        'new' => 'Neue Seite',
+        'invalid_url' => 'Ungültiges URL-Format. Die URL muss mit einem Slash beginnen und darf nur Ziffern, lateinische Zeichen und die folgenden Symbole beinhalten: _-[]:?|/+*',
+        'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Seiten wirklich löschen?',
+        'delete_confirm_single' => 'Wollen Sie diese Seite wirklich löschen?',
+        'no_layout' => '-- Kein Layout --'
+    ],
+    'layout' => [
+        'not_found' => "Das Layout ':name' wurde nicht gefunden",
+        'menu_label' => 'Layouts',
+        'no_list_records' => 'Keine Layouts gefunden',
+        'new' => 'Neues Layout',
+        'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Layouts wirklich löschen?',
+        'delete_confirm_single' => 'Wollen Sie das ausgewählte Layout wirklich löschen?'
+    ],
+    'partial' => [
+        'invalid_name' => "Ungültiger Partial-Name: :name.",
+        'not_found' => "Das Partial ':name' wurde nicht gefunden.",
+        'menu_label' => 'Partials',
+        'no_list_records' => 'Keine Partials gefunden',
+        'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Partials wirklich löschen?',
+        'delete_confirm_single' => 'Wollen Sie das ausgewählte Partial wirklich löschen?',
+        'new' => 'Neues Partial'
+    ],
+    'content' => [
+        'not_found' => "Die Inhaltsdatei ':name' wurde nicht gefundne.",
+        'menu_label' => 'Inhalt',
+        'no_list_records' => 'Keine Inhaltsdateien gefunden',
+        'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Inhalte und Verzeichnisse wirklich löschen?',
+        'delete_confirm_single' => 'Wollen Sie diese Inhaltsdatei wirklich löschen?',
+        'new' => 'Neue Inhaltsdatei'
+    ],
+    'ajax_handler' => [
+        'invalid_name' => "Ungültiger Name für AJAX Handler: :name.",
+        'not_found' => "AJAX Handler ':name' wurde nicht gefunden.",
+    ],
+    'combiner' => [
+        'not_found' => "Die combiner Datei ':name' wurde nicht gefunden.",
+    ],
+    'cms' => [
+        'menu_label' => "CMS"
+    ],
+    'asset' => [
+        'menu_label' => "Assets",
+        'drop_down_add_title' => 'Hinzufügen...',
+        'drop_down_operation_title' => 'Aktion...',
+        'upload_files' => 'Datei(en) hochladen',
+        'create_file' => 'Datei erstellen',
+        'create_directory' => 'Verzeichnis erstellen',
+        'rename' => 'Umbenennen',
+        'delete' => 'Löschen',
+        'move' => 'Bewegen',
+        'new' => 'Neue Datei',
+        'rename_popup_title' => 'Umbenennen',
+        'rename_new_name' => 'Neuer Name',
+        'invalid_path' => 'Pfade dürfen ausschließlich Ziffern, lateinische Zeichen, Leerzeichen sowie die folgenden Symbole enthalten: ._-/',
+        'error_deleting_file' => 'Fehler beim Löschen der Datei :name.',
+        'error_deleting_dir_not_empty' => 'Fehler beim Löschen des Verzeichnisses :name, da es nicht leer ist.',
+        'error_deleting_dir' => 'Fehler beim Löschen der Datei :name.',
+        'invalid_name' => 'Asset-Name darf nur Ziffern, lateinische Zeichen, Leerzeichen sowie die folgenden Symbole enthalten: ._-',
+        'original_not_found' => 'Originaldatei oder -verzeichnis wurde nicht gefunden',
+        'already_exists' => 'Datei oder Verzeichnis mit diesem Namen existiert bereits',
+        'error_renaming' => 'Fehler beim Umbenennen der Datei bzw. des Verzeichnisses',
+        'name_cant_be_empty' => 'Es muss ein Name angegeben werden',
+        'too_large' => 'Die hochzuladende Datei ist zu groß. Sie dürfen maximal Dateien der Größe :max_size hochladen',
+        'type_not_allowed' => 'Es sind ausschließlich folgende Dateiendungen erlaubt: :allowed_types',
+        'file_not_valid' => 'Datei ist ungültig',
+        'error_uploading_file' => 'Fehler beim Hochladen der Datei ":name": :error',
+        'move_please_select' => 'Bitte auswählen',
+        'move_destination' => 'Zielverzeichnis',
+        'move_popup_title' => 'Assets bewegen',
+        'move_button' => 'Bewegen',
+        'selected_files_not_found' => 'Ausgewählte Dateien nicht gefunden',
+        'select_destination_dir' => 'Bitte wählen Sie ein Zielverzeichnis aus',
+        'destination_not_found' => 'Zielverzeichnis wurde nicht gefunden',
+        'error_moving_file' => 'Fehler beim Bewegen der Datei :file',
+        'error_moving_directory' => 'Fehler beim Bewegen des Verzeichnisses :dir',
+        'error_deleting_directory' => 'Fehler beim Löschen des Originalverzeichnisses :dir',
+        'path' => 'Pfad'
+    ],
+    'component' => [
+        'menu_label' => "Komponenten",
+        'unnamed' => "Unbenannt",
+        'no_description' => "Keine Beschreibung angegeben",
+        'alias' => "Verknüpfung",
+        'alias_description' => "Dieser Komponente wird ein eindeutiger Name gegeben, wenn sie im Code von Seite oder Layout benutzt wird.",
+        'validation_message' => "Komponentenverknüpfungen werden benötigt und dürfen nur lateinische Zeichen, Ziffern und Unterstriche beinhalten. Die Verknüpfungen müssen mit einem lateinischen Zeichen beginnen.",
+        'invalid_request' => "Aufgrund ungültiger Komponentendaten kann das Template nicht gespeichert werden.",
+        'no_records' => 'Keine Komponenten gefunden',
+        'not_found' => "Die Komponente ':name' wurde nicht gefunden.",
+        'method_not_found' => "Die Komponente ':name' enthält keine Methode mit Namen ':method'.",
+    ],
+    'template' => [
+        'invalid_type' => "Unbekannter Template-Typ.",
+        'not_found' => "Das angeforderte Template wurde nicht gefunden.",
+        'saved'=> "Das Template wurde erfolgreich gespeichert."
+    ]
+];
\ No newline at end of file
diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php
new file mode 100644
index 000000000..b30a5d239
--- /dev/null
+++ b/modules/system/lang/de/lang.php
@@ -0,0 +1,96 @@
+<?php
+
+return [
+    'app' => [
+        'name' => 'October CMS',
+        'motto' => 'Zurück zum Wesentlichen',
+    ],
+    'directory' => [
+        'create_fail' => "Konnte Verzeichnis: :name nicht erstellen",
+    ],
+    'file' => [
+        'create_fail' => "Konnte Datei :name nicht erstellen",
+    ],
+    'system' => [
+        'name' => 'System',
+        'menu_label' => 'System',
+    ],
+    'plugin' => [
+        'unnamed' => 'Unbenanntes Plugin',
+        'name' => [
+            'label' => 'Plugin-Name',
+            'help' => 'Benennen Sie das Plugin eindeutig, zum Beispiel RainLab.Blog',
+        ],
+    ],
+    'project' => [
+        'name' => 'Projekt',
+        'owner_label' => 'Besitzer',
+        'id' => [
+            'label' => 'Projekt-ID',
+            'help' => 'Wie Sie Ihre Projekt-ID finden',
+            'missing' => 'Bitte geben Sie eine Projekt-ID an.',
+        ],
+        'unbind_success' => 'Projekt wurde erfolgreich getrennt (detached).',
+    ],
+    'settings' => [
+        'menu_label' => 'Einstellungen',
+        'missing_model' => 'Der Einstellungsseite fehlt eine Model-Definition.',
+        'update_success' => 'Einstellung für :name wurde erfolgreich aktualisiert.',
+    ],
+    'install' => [
+        'project_label' => 'Mit Projekt verbinden',
+        'plugin_label' => 'Plugin installieren',
+        'missing_plugin_name' => 'Bitte geben Sie den Namen des zu installierenden Plugin an.',
+        'install_completing' => 'Schließe Installationsprozess ab',
+        'install_success' => 'Das Plugin wurde erfolgreich installiert.',
+    ],
+    'updates' => [
+        'name' => 'Software-Aktualisierung',
+        'menu_label' => 'Aktualisierungen',
+        'check_label' => 'Auf Aktualisierungen überprüfen',
+        'retry_label' => 'Erneut versuchen',
+        'core_build' => 'Aktueller Build',
+        'core_build_old' => 'Aktueller Build :build',
+        'core_build_new' => 'Build :build',
+        'core_build_new_help' => 'Aktuellster Build ist verfügbar.',
+        'core_downloading' => 'Applikationsdaten werden heruntergeladen',
+        'core_extracting' => 'Applikationsdaten werden entpackt',
+        'plugin_downloading' => 'Lade Plugin herunter: :name',
+        'plugin_extracting' => 'Entpacke Plugin: :name',
+        'plugin_version_none' => 'Neues Plugin',
+        'plugin_version_old' => 'Aktuellste Version v:version',
+        'plugin_version_new' => 'v:version',
+        'update_label' => 'Aktualisieren',
+        'update_completing' => 'Schließe Aktualisierung ab',
+        'update_loading' => 'Lade verfügbare Aktualisierungen...',
+        'update_success' => 'Aktualisierungsvorgang erfolgreich.',
+        'update_failed_label' => 'Aktualisierungsvorgang fehlgeschlagen',
+        'force_label' => 'Aktualisierung erzwingen',
+        'found' => [
+            'label' => 'Neue Aktualisierungen gefunden!',
+            'help' => '"Aktualisieren" wählen um Prozess zu starten ',
+        ],
+        'none' => [
+            'label' => 'Keine Aktualisierungen',
+            'help' => 'Es wurden keine Aktualisierungen gefunden.',
+        ],
+    ],
+    'server' => [
+        'connect_error' => 'Fehler beim Verbinden mit dem Server.',
+        'response_not_found' => 'Der Aktualisierungs-Server kann nicht gefunden werden.',
+        'response_invalid' => 'Ungültige Antwort vom Server.',
+        'response_empty' => 'Ergebnislose Antwort vom Server.',
+        'file_error' => 'Server konnte Paket nicht zur Verfügung stellen.',
+        'file_corrupt' => 'Angelieferte Datei ist fehlerhaft.',
+    ],
+    'behavior' => [
+        'missing_property' => 'Klasse :class muss Eingenschaft $:property besitzen, da sie von Verhalten (behaviour) :behavior benötigt wird.',
+    ],
+    'config' => [
+        'not_found' => 'Konnte Konfigurationsdatei :file definiert für :location nicht finden.',
+        'required' => 'Konfiguration, die in :location benutzt wird, muss den Wert :property zur Verfügung stellen.',
+    ],
+    'zip' => [
+        'extract_failed' => "Konnte Core-Datei ':file' nicht entpacken.",
+    ],
+];
\ No newline at end of file
diff --git a/modules/system/lang/de/validation.php b/modules/system/lang/de/validation.php
new file mode 100644
index 000000000..894e01caf
--- /dev/null
+++ b/modules/system/lang/de/validation.php
@@ -0,0 +1,98 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Validation Language Lines
+	|--------------------------------------------------------------------------
+	|
+	| The following language lines contain the default error messages used by
+	| the validator class. Some of these rules have multiple versions such
+	| such as the size rules. Feel free to tweak each of these messages.
+	|
+	*/
+
+	"accepted"         => ":attribute muss bestätigt werden.",
+	"active_url"       => ":attribute ist keine gültige URL.",
+	"after"            => ":attribute muss ein Datum nach :date sein.",
+	"alpha"            => ":attribute darf nur Buchstaben enthalten.",
+	"alpha_dash"       => ":attribute darf nur Buchstaben, Ziffern und Bindestriche enthalten.",
+	"alpha_num"        => ":attribute darf nur Buchstaben und Ziffern enthalten.",
+	"array"            => ":attribute muss ein Array sein.",
+	"before"           => ":attribute muss ein Datum vor :date sein.",
+	"between"          => array(
+		"numeric" => ":attribute muss zwischen :min und :max liegen.",
+		"file"    => ":attribute muss zwischen :min und :max kilobytes groß sein.",
+		"string"  => ":attribute-Zeichenanzahl muss zwischen :min und :max liegen.",
+		"array"   => ":attribute-Elementanzahl muss zwischen :min und :max liegen.",
+	),
+	"confirmed"        => "Bestätigung zu :attribute stimmt nicht überein",
+	"date"             => ":attribute ist kein gültiges Datum.",
+	"date_format"      => ":attribute hat kein gültiges Datumsformat :format.",
+	"different"        => ":attribute und :other müssen sich unterscheiden.",
+	"digits"           => "Das :attribute benötigt :digits Zeichen.",
+	"digits_between"   => ":attribute-Zeichenanzahl muss zwischen :min und :max liegen.",
+	"email"            => "Format von :attribute ist ungültig.",
+	"exists"           => "Das ausgewählte Attribut :attribute ist ungültig.",
+	"image"            => ":attribute muss ein Bild sein.",
+	"in"               => "Das ausgewählte Attribut :attribute ist ungültig.",
+	"integer"          => ":attribute muss eine Ganzzahl (integer) sein.",
+	"ip"               => ":attribute muss eine gültige IP-Adresse sein.",
+	"max"              => array(
+		"numeric" => ":attribute darf nicht größer als :max sein.",
+		"file"    => ":attribute darf nicht größer als :max kilobytes sein.",
+		"string"  => "Dateiname von :attribute darf nicht mehr als :max Zeichen haben.",
+		"array"   => ":attribute darf nicht mehr als :max Elemente besitzen.",
+	),
+	"mimes"            => ":attribute muss eine Datei des Typs: :values sein.",
+	"min"              => array(
+		"numeric" => ":attribute muss mindestens :min sein.",
+		"file"    => ":attribute darf nicht kleiner als :min kilobytes sein.",
+		"string"  => "Dateiname von :attribute darf nicht weniger als :min Zeichen haben.",
+		"array"   => ":attribute darf nicht weniger als :min Elemente besitzen.",
+	),
+	"not_in"           => "Das ausgewählte Attribut :attribute ist ungültig.",
+	"numeric"          => ":attribute muss eine Zahl sein.",
+	"regex"            => "Format von :attribute ist ungültig.",
+	"required"         => ":attribute wird benötigt.",
+	"required_if"      => ":attribute wird benötigt, wenn :other den Wert :value hat.",
+	"required_with"    => ":attribute wird benötigt, wenn :values existiert.",
+	"required_without" => ":attribute wird benötigt, wenn :values nicht existiert.",
+	"same"             => ":attribute und :other müssen übereinstimmen.",
+	"size"             => array(
+		"numeric" => ":attribute muss :size groß sein.",
+		"file"    => ":attribute muss :size kilobytes groß sein.",
+		"string"  => "Name von :attribute muss :size Zeichen beinhalten.",
+		"array"   => ":attribute muss :size Elemente beinhalten.",
+	),
+	"unique"           => ":attribute muss eindeutig sein.",
+	"url"              => "Format von :attribute ist ungültig.",
+
+	/*
+	|--------------------------------------------------------------------------
+	| Custom Validation Language Lines
+	|--------------------------------------------------------------------------
+	|
+	| Here you may specify custom validation messages for attributes using the
+	| convention "attribute.rule" to name the lines. This makes it quick to
+	| specify a specific custom language line for a given attribute rule.
+	|
+	*/
+
+	'custom' => array(),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Custom Validation Attributes
+	|--------------------------------------------------------------------------
+	|
+	| The following language lines are used to swap attribute place-holders
+	| with something more reader friendly such as E-Mail Address instead
+	| of "email". This simply helps us make messages a little cleaner.
+	|
+	*/
+
+	'attributes' => array(),
+
+);

From ddcc63ef6cf529e7c5e03b65dc95175e79a47769 Mon Sep 17 00:00:00 2001
From: Jasper <me@jspr.cc>
Date: Thu, 15 May 2014 22:23:29 +0200
Subject: [PATCH 15/24] Updated Backend + System language support

Moved hard-coded text in "backend" and "system" to the language files
(English and Dutch). Affected pages: administrator management,
administrator group management, system updates, system settings, email
settings. Also made some strings more generic for general use (like
"Saving...." instead of "Saving administrator account...")
---
 modules/backend/controllers/groups/create.htm |  4 +--
 modules/backend/controllers/groups/update.htm |  8 +++---
 modules/backend/controllers/users/create.htm  |  4 +--
 .../backend/controllers/users/mysettings.htm  |  4 +--
 modules/backend/controllers/users/update.htm  |  6 ++--
 modules/backend/lang/en/lang.php              | 11 +++-----
 modules/backend/lang/nl/lang.php              | 11 +++-----
 modules/system/ServiceProvider.php            |  4 +--
 modules/system/controllers/Settings.php       |  2 +-
 modules/system/controllers/settings/index.htm |  4 +--
 .../system/controllers/settings/update.htm    | 10 +++----
 .../controllers/updates/config_list.yaml      |  2 +-
 modules/system/controllers/updates/index.htm  |  6 ++--
 modules/system/lang/en/lang.php               | 26 +++++++++++++++++
 modules/system/lang/nl/lang.php               | 28 ++++++++++++++++++-
 .../system/models/emailsettings/fields.yaml   | 24 ++++++++--------
 .../system/models/pluginversion/columns.yaml  |  8 +++---
 17 files changed, 104 insertions(+), 58 deletions(-)

diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm
index 11515d3bc..5f9bd728a 100644
--- a/modules/backend/controllers/groups/create.htm
+++ b/modules/backend/controllers/groups/create.htm
@@ -19,7 +19,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
                 </button>
@@ -29,7 +29,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
diff --git a/modules/backend/controllers/groups/update.htm b/modules/backend/controllers/groups/update.htm
index fc1b99ed2..2e42cf76e 100644
--- a/modules/backend/controllers/groups/update.htm
+++ b/modules/backend/controllers/groups/update.htm
@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
@@ -38,8 +38,8 @@
                     type="button"
                     class="btn btn-danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.deleting')) ?>"
-                    data-request-confirm="Do you really want to delete this admin?">
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.user.group.delete_confirm')) ?>">
                     <?= e(trans('backend::lang.form.delete')) ?>
                 </button>
             </div>
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index 07d629402..b473c3b5c 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -19,7 +19,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
                 </button>
@@ -29,7 +29,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
diff --git a/modules/backend/controllers/users/mysettings.htm b/modules/backend/controllers/users/mysettings.htm
index e303b1f5f..157c5edd2 100644
--- a/modules/backend/controllers/users/mysettings.htm
+++ b/modules/backend/controllers/users/mysettings.htm
@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index 41f053dbd..7a0281ae2 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
@@ -41,7 +41,7 @@
                     type="button"
                     class="oc-icon-trash-o btn-icon danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.user.deleting')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
                     data-request-confirm="<?= e(trans('backend::lang.user.delete_confirm')) ?>">
                 </button>
             </div>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 06ad0d334..c206c881d 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -60,9 +60,6 @@ return [
         'superuser_comment' => "Check this box to allow this person to access all areas.",
         'send_invite' => 'Send invitation by email',
         'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email',
-        'creating' => 'Creating Administrator...',
-        'saving' => 'Saving Administrator...',
-        'deleting' => 'Deleting Administrator...',
         'delete_confirm' => 'Do you really want to delete this administrator?',
         'return' => 'Return to the administrator list',
         'group' => [
@@ -71,9 +68,7 @@ return [
             'menu_label' => 'Groups',
             'list_title' => 'Manage Groups',
             'new' => 'New Administrator Group',
-            'creating' => 'Creating Group...',
-            'saving' => 'Saving Group...',
-            'deleting' => 'Deleting Group...',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
             'return' => 'Return to the group list',
         ],
         'preferences' => [
@@ -103,16 +98,18 @@ return [
         'not_found' => 'Form record with an ID of :id could not be found.',
         'create' => 'Create',
         'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Save',
         'save_and_close' => 'Save and close',
         'saving' => 'Saving...',
+        'delete' => 'Delete',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Misc',
         'field_off' => 'Off',
         'field_on' => 'On',
         'apply' => 'Apply',
         'cancel' => 'Cancel',
         'close' => 'Close',
-        'delete' => 'Delete',
         'ok' => 'OK',
         'or' => 'or',
         'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.',
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index 54e35f9e8..569f86262 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -60,9 +60,6 @@ return [
         'superuser_comment' => "Vink deze optie aan om de gebruiker volledige rechten tot het systeem te geven.",
         'send_invite' => 'Stuur uitnodiging per e-mail',
         'send_invite_comment' => 'Vink deze optie aan om de gebruiker een uitnodiging per e-mail te sturen',
-        'creating' => 'Administrator aanmaken...',
-        'saving' => 'Administrator opslaan...',
-        'deleting' => 'Groep verwijderen...',
         'delete_confirm' => 'Weet je zeker dat je deze beheerder wilt verwijderen?',
         'return' => 'Terug naar beheerdersoverzicht',
         'group' => [
@@ -71,9 +68,7 @@ return [
             'menu_label' => 'Groepen',
             'list_title' => 'Beheer Groepen',
             'new' => 'Nieuwe Beheerdersgroep',
-            'creating' => 'Groep aanmaken...',
-            'saving' => 'Groep opslaan...',
-            'deleting' => 'Groep verwijderen...',
+            'delete_confirm' => 'Weet je zeker dat je deze beheerdersgroep wilt verwijderen?',
             'return' => 'Terug naar groepenoverzicht',
         ],
         'preferences' => [
@@ -103,16 +98,18 @@ return [
         'not_found' => 'Het formulier met record ID :id is niet gevonden.',
         'create' => 'Maken',
         'create_and_close' => 'Maken en sluiten',
+        'creating' => 'Maken...',
         'save' => 'Opslaan',
         'save_and_close' => 'Opslaan en sluiten',
         'saving' => 'Opslaan...',
+        'delete' => 'Verwijderen',
+        'deleting' => 'Verwijderen...',
         'undefined_tab' => 'Overig',
         'field_off' => 'Uit',
         'field_on' => 'Aan',
         'apply' => 'Toepassen',
         'cancel' => 'Annuleren',
         'close' => 'Sluiten',
-        'delete' => 'Verwijderen',
         'ok' => 'OK',
         'or' => 'of',
         'confirm_tab_close' => 'Weet je zeker dat je dit tabblad wilt sluiten? Niet opgeslagen wijzigingen gaan verloren.',
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 75f1bc404..663256e42 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -155,8 +155,8 @@ class ServiceProvider extends ModuleServiceProvider
         SettingsManager::instance()->registerCallback(function($manager){
             $manager->registerSettingItems('October.System', [
                 'email' => [
-                    'label'       => 'Email Configuration',
-                    'description' => 'Manage email configuration.',
+                    'label'       => 'system::lang.email.menu_label',
+                    'description' => 'system::lang.email.menu_description',
                     'category'    => 'System',
                     'icon'        => 'icon-envelope',
                     'class'       => 'System\Models\EmailSettings',
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index c06fd519a..91185cd0b 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -73,7 +73,7 @@ class Settings extends Controller
         }
         $model->save(null, $this->formWidget->getSessionKey());
 
-        Flash::success(Lang::get('system::lang.settings.update_success', ['name'=>$item->label]));
+        Flash::success(Lang::get('system::lang.settings.update_success', ['name' => Lang::get($item->label)]));
 
         if ($redirect = Backend::Url('system/settings'))
             return Redirect::to($redirect);
diff --git a/modules/system/controllers/settings/index.htm b/modules/system/controllers/settings/index.htm
index b460f89b9..32d8c0220 100644
--- a/modules/system/controllers/settings/index.htm
+++ b/modules/system/controllers/settings/index.htm
@@ -12,8 +12,8 @@
                 <div class="settings-item col-xs-12 col-sm-6 col-md-4">
                     <a href="<?= $item->url ?>">
                         <div class="item-icon"><i class="<?= $item->icon ?>"></i></div>
-                        <h5><?= $item->label ?></h5>
-                        <p><?= $item->description ?></p>
+                        <h5><?= e(trans($item->label)) ?></h5>
+                        <p><?= e(trans($item->description)) ?></p>
                     </a>
                 </div>
             <?php endforeach ?>
diff --git a/modules/system/controllers/settings/update.htm b/modules/system/controllers/settings/update.htm
index e66e74ab0..e6781bcef 100644
--- a/modules/system/controllers/settings/update.htm
+++ b/modules/system/controllers/settings/update.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/settings') ?>">Settings</a></li>
+        <li><a href="<?= Backend::url('system/settings') ?>"><?= e(trans('system::lang.settings.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -19,13 +19,13 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Saving..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave settings
+                    <?= e(trans('backend::lang.form.save')) ?>
                 </button>
 
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('system/settings') ?>">Cancel</a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/settings') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
             </div>
         </div>
@@ -33,5 +33,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('system/settings') ?>" class="btn btn-default">Return to system settings</a></p>
+    <p><a href="<?= Backend::url('system/settings') ?>" class="btn btn-default"><?= e(trans('system::lang.settings.return')) ?></a></p>
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/system/controllers/updates/config_list.yaml b/modules/system/controllers/updates/config_list.yaml
index 753ac8f83..114251feb 100644
--- a/modules/system/controllers/updates/config_list.yaml
+++ b/modules/system/controllers/updates/config_list.yaml
@@ -2,7 +2,7 @@
 #  List Behavior Config
 # ===================================
 
-title: Manage Updates
+title: system::lang.updates.title
 list: @/modules/system/models/pluginversion/columns.yaml
 modelClass: System\Models\PluginVersion
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/system/controllers/updates/index.htm b/modules/system/controllers/updates/index.htm
index e5da14949..48ae53f9c 100644
--- a/modules/system/controllers/updates/index.htm
+++ b/modules/system/controllers/updates/index.htm
@@ -10,16 +10,16 @@
                         href="javascript:;"
                         data-request-confirm="Are you sure?"
                         data-request="onDetachProject"
-                        data-stripe-load-indicator>detach</a>)
+                        data-stripe-load-indicator><?= e(trans('system::lang.project.detach_confirm')) ?></a>)
                 </p>
             <?php else: ?>
-                <p class="oc-icon-chain-broken">None</p>
+                <p class="oc-icon-chain-broken"><?= e(trans('system::lang.project.none')) ?></p>
                 <p class="description">
                     <a
                         href="javascript:;"
                         data-control="popup"
                         data-handler="onLoadProjectForm">
-                        Attach to Project
+                        <?= e(trans('system::lang.project.attach')) ?>
                     </a>
                 </p>
             <?php endif ?>
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 3d174122f..b43704742 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -25,17 +25,38 @@ return [
     'project' => [
         'name' => 'Project',
         'owner_label' => 'Owner',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Project ID',
             'help' => 'How to find your Project ID',
             'missing' => 'Please specify a Project ID to use.',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Project has been detached successfully.',
     ],
     'settings' => [
         'menu_label' => 'Settings',
         'missing_model' => 'The settings page is missing a Model definition.',
         'update_success' => 'Settings for :name have been updated successfully.',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'install' => [
         'project_label' => 'Attach to Project',
@@ -45,10 +66,15 @@ return [
         'install_success' => 'The plugin has been installed successfully.',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Software update',
         'menu_label' => 'Updates',
         'check_label' => 'Check for updates',
         'retry_label' => 'Try again',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Current build',
         'core_build_old' => 'Current build :build',
         'core_build_new' => 'Build :build',
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index 6b02ed2d4..b421c0f15 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -25,17 +25,38 @@ return [
     'project' => [
         'name' => 'Project',
         'owner_label' => 'Eigenaar',
+        'attach' => 'Project Koppelen',
+        'detach' => 'Project Ontkoppelen',
+        'none' => 'Geen',
         'id' => [
             'label' => 'Project ID',
             'help' => 'Hoe vind je jouw Project ID',
             'missing' => 'Voer een Project ID in.',
         ],
-        'unbind_success' => 'Project is succesvol losgekoppeld.',
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
+        'unbind_success' => 'Project is succesvol ontkoppeld.',
     ],
     'settings' => [
         'menu_label' => 'Instellingen',
         'missing_model' => 'De instellingenpagina mist de definitie van een Model.',
         'update_success' => 'Instellingen voor :name zijn succesvol bijgewerkt.',
+        'return' => 'Terug naar systeeminstellingen',
+    ],
+    'email' => [
+        'menu_label' => 'E-mailinstellingen',
+        'menu_description' => 'Beheer e-mailinstellingen.',
+        'method' => 'Email Methode',
+        'sender_name' => 'Naam Afzender',
+        'sender_email' => 'E-mailadres Afzender',
+        'smtp_address' => 'SMTP Adres',
+        'smtp_authorization' => 'SMTP authenticatie vereist',
+        'smtp_authorization_comment' => 'Vink deze optie aan indien de SMTP server authenticatie vereist.',
+        'smtp_username' => 'Gebruikersnaam',
+        'smtp_password' => 'Wachtwoord',
+        'smtp_port' => 'SMTP Poort',
+        'smtp_ssl' => 'SSL verbinding vereist',
+        'sendmail_path' => 'Pad naar Sendmail',
+        'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.',
     ],
     'install' => [
         'project_label' => 'Koppel aan Project',
@@ -45,10 +66,15 @@ return [
         'install_success' => 'De plugin is succesvol geïnstalleerd.',
     ],
     'updates' => [
+        'title' => 'Beheer Updates',
         'name' => 'Applicatie-update',
         'menu_label' => 'Updates',
         'check_label' => 'Controleer op updates',
         'retry_label' => 'Probeer nogmaals',
+        'plugin_name' => 'Naam',
+        'plugin_description' => 'Omschrijving',
+        'plugin_version' => 'Versie',
+        'plugin_author' => 'Auteur',
         'core_build' => 'Huidige build',
         'core_build_old' => 'Huidige build :build',
         'core_build_new' => 'Build :build',
diff --git a/modules/system/models/emailsettings/fields.yaml b/modules/system/models/emailsettings/fields.yaml
index ce86abe5f..4d268a91b 100644
--- a/modules/system/models/emailsettings/fields.yaml
+++ b/modules/system/models/emailsettings/fields.yaml
@@ -6,50 +6,50 @@ tabs:
 
   fields:
     send_mode:
-      label: Email Method
+      label: system::lang.email.method
       type: dropdown
       tab: General
 
     sender_name:
-      label: Sender Name
+      label: system::lang.email.sender_name
       span: auto
       tab: General
 
     sender_email:
-      label: Sender Email
+      label: system::lang.email.sender_email
       span: auto
       tab: General
 
     smtp_address:
-      label: SMTP address
+      label: system::lang.email.smtp_address
       tab: SMTP
 
     smtp_authorization:
       type: checkbox
-      label: SMTP Authorization Required
+      label: system::lang.email.smtp_authorization
       tab: SMTP
-      comment: Use this checkbox if your SMTP server requires authorization.
+      comment: system::lang.email.smtp_authorization_comment
 
     smtp_user:
-      label: User
+      label: system::lang.email.smtp_username
       tab: SMTP
       span: left
 
     smtp_password:
-      label: Password
+      label: system::lang.email.smtp_password
       tab: SMTP
       span: right
 
     smtp_port:
-      label: SMTP Port
+      label: system::lang.email.smtp_port
       tab: SMTP
 
     smtp_ssl:
       type: checkbox
-      label: SSL connection required
+      label: system::lang.email.smtp_ssl
       tab: SMTP
 
     sendmail_path:
-      label: Sendmail path
-      commentAbove: Please specify the path of the sendmail program.
+      label: system::lang.email.sendmail_path
+      commentAbove: system::lang.email.sendmail_path_comment
       tab: Sendmail
\ No newline at end of file
diff --git a/modules/system/models/pluginversion/columns.yaml b/modules/system/models/pluginversion/columns.yaml
index db4ea1ff9..0e3c09bea 100644
--- a/modules/system/models/pluginversion/columns.yaml
+++ b/modules/system/models/pluginversion/columns.yaml
@@ -5,17 +5,17 @@
 columns:
 
   name:
-    label: Name
+    label: system::lang.updates.plugin_name
     sortable: false
 
   description:
-    label: Description
+    label: system::lang.updates.plugin_description
     sortable: false
 
   version:
-    label: Version
+    label: system::lang.updates.plugin_version
     sortable: false
 
   author:
-    label: Author
+    label: system::lang.updates.plugin_author
     sortable: false
\ No newline at end of file

From 8cc375939f3d8ed3acad742054ca9d5cdfd01bba Mon Sep 17 00:00:00 2001
From: alxy <alexander@familie-guth.com>
Date: Thu, 15 May 2014 22:32:56 +0200
Subject: [PATCH 16/24] Minor fixes

---
 modules/system/traits/AssetMaker.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index b05b3cd4e..41676ce55 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -115,7 +115,7 @@ trait AssetMaker
         $cssPath = $this->getAssetPath($name);
 
         if (isset($this->controller))
-            $this->controller->addCss($cssPath);
+            $this->controller->addCss($cssPath, $attributes);
 
         if (substr($cssPath, 0, 1) == '/')
             $cssPath = Request::getBaseUrl() . $cssPath;
@@ -139,7 +139,7 @@ trait AssetMaker
         $rssPath = $this->getAssetPath($name);
 
         if (isset($this->controller))
-            $this->controller->addRss($rssPath);
+            $this->controller->addRss($rssPath, $attributes);
 
         if (substr($rssPath, 0, 1) == '/')
             $rssPath = Request::getBaseUrl() . $rssPath;

From 8d82727310e76389dd873eea9a73b3e49d761dad Mon Sep 17 00:00:00 2001
From: Jasper <me@jspr.cc>
Date: Fri, 16 May 2014 01:04:40 +0200
Subject: [PATCH 17/24] Updated CMS language support

Moved hard-coded text in "cms" to the language files (English and
Dutch). And some minor changes.
---
 .../widgets/form/partials/_field_text.htm     |  2 +-
 .../widgets/form/partials/_field_textarea.htm |  2 +-
 .../widgets/form/partials/_form_tabs.htm      |  2 +-
 modules/cms/classes/asset/fields.yaml         |  4 +--
 modules/cms/classes/content/fields.yaml       |  4 +--
 modules/cms/classes/layout/fields.yaml        |  8 ++---
 modules/cms/classes/page/fields.yaml          | 30 +++++++++----------
 modules/cms/classes/partial/fields.yaml       |  6 ++--
 .../cms/controllers/index/_page_toolbar.htm   |  4 +--
 modules/cms/lang/en/lang.php                  | 20 +++++++++++++
 modules/cms/lang/nl/lang.php                  | 20 +++++++++++++
 .../widgets/assetlist/partials/_toolbar.htm   |  4 +--
 .../componentlist/partials/_toolbar.htm       |  2 +-
 .../templatelist/partials/_toolbar.htm        |  4 +--
 modules/system/lang/en/lang.php               |  3 ++
 modules/system/lang/nl/lang.php               |  3 ++
 .../system/models/emailsettings/fields.yaml   | 20 ++++++-------
 17 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/modules/backend/widgets/form/partials/_field_text.htm b/modules/backend/widgets/form/partials/_field_text.htm
index 1e2a94ba8..04d8aefe6 100644
--- a/modules/backend/widgets/form/partials/_field_text.htm
+++ b/modules/backend/widgets/form/partials/_field_text.htm
@@ -7,7 +7,7 @@
         name="<?= $field->getName() ?>"
         id="<?= $field->getId() ?>"
         value="<?= e($field->value) ?>"
-        placeholder="<?= e($field->placeholder) ?>"
+        placeholder="<?= e(trans($field->placeholder)) ?>"
         class="form-control"
         autocomplete="off"
         maxlength="255"
diff --git a/modules/backend/widgets/form/partials/_field_textarea.htm b/modules/backend/widgets/form/partials/_field_textarea.htm
index 6535a36d7..40cbf4815 100644
--- a/modules/backend/widgets/form/partials/_field_textarea.htm
+++ b/modules/backend/widgets/form/partials/_field_textarea.htm
@@ -7,6 +7,6 @@
         id="<?= $field->getId() ?>"
         autocomplete="off"
         class="form-control field-textarea size-<?= $field->size ?>"
-        placeholder="<?= $field->placeholder ?>"
+        placeholder="<?= e(trans($field->placeholder)) ?>"
         <?= HTML::attributes($field->attributes) ?>><?= e($field->value) ?></textarea>
 <?php endif?>
\ No newline at end of file
diff --git a/modules/backend/widgets/form/partials/_form_tabs.htm b/modules/backend/widgets/form/partials/_form_tabs.htm
index 0e12bf53c..0ff0eda25 100644
--- a/modules/backend/widgets/form/partials/_form_tabs.htm
+++ b/modules/backend/widgets/form/partials/_form_tabs.htm
@@ -5,7 +5,7 @@
 <div class="<?= $isStretch?'layout-row min-size':'' ?>">
     <ul class="nav nav-tabs">
         <?php $index = 0; foreach ($tabs as $name => $fields): ?>
-            <li class="<?= $index++==0?'active':''?>"><a href="#<?= $type.'tab-'.$index ?>"><?= $name ?></a></li>
+            <li class="<?= $index++==0?'active':''?>"><a href="#<?= $type.'tab-'.$index ?>"><?= e(trans($name)) ?></a></li>
         <?php endforeach ?>
     </ul>
 </div>
diff --git a/modules/cms/classes/asset/fields.yaml b/modules/cms/classes/asset/fields.yaml
index 14c5f4af7..774eeadbb 100644
--- a/modules/cms/classes/asset/fields.yaml
+++ b/modules/cms/classes/asset/fields.yaml
@@ -1,6 +1,6 @@
 fields:
   fileName:
-    label: File Name
+    label: cms::lang.editor.filename
     attributes:
       default-focus: 1
 
@@ -13,7 +13,7 @@ secondaryTabs:
   stretch: true
   fields:
     content:
-      tab: Content
+      tab: cms::lang.editor.content
       type: codeeditor
       stretch: true
       options:
diff --git a/modules/cms/classes/content/fields.yaml b/modules/cms/classes/content/fields.yaml
index 1715b6112..09aa6ca4e 100644
--- a/modules/cms/classes/content/fields.yaml
+++ b/modules/cms/classes/content/fields.yaml
@@ -1,6 +1,6 @@
 fields:
   fileName:
-    label: File Name
+    label: cms::lang.editor.filename
     attributes:
       default-focus: 1
 
@@ -13,7 +13,7 @@ secondaryTabs:
   stretch: true
   fields:
     content:
-      tab: Content
+      tab: cms::lang.editor.content
       type: codeeditor
       stretch: true
       options:
diff --git a/modules/cms/classes/layout/fields.yaml b/modules/cms/classes/layout/fields.yaml
index 185bed55f..2984deb7d 100644
--- a/modules/cms/classes/layout/fields.yaml
+++ b/modules/cms/classes/layout/fields.yaml
@@ -1,12 +1,12 @@
 fields:
   fileName:
-    label: File Name
+    label: cms::lang.editor.filename
     span: left
     attributes:
       default-focus: 1
 
   settings[description]:
-    label: Description
+    label: cms::lang.editor.description
     span: right
 
   toolbar:
@@ -20,14 +20,14 @@ secondaryTabs:
   stretch: true
   fields:
     markup:
-      tab: Markup
+      tab: cms::lang.editor.markup
       type: codeeditor
       stretch: true
       options:
         language: twig
 
     code:
-      tab: Code
+      tab: cms::lang.editor.code
       type: codeeditor
       stretch: true
       options:
diff --git a/modules/cms/classes/page/fields.yaml b/modules/cms/classes/page/fields.yaml
index bd289b698..b643a9f3e 100644
--- a/modules/cms/classes/page/fields.yaml
+++ b/modules/cms/classes/page/fields.yaml
@@ -1,15 +1,15 @@
 fields:
   settings[title]:
     span: left
-    label: Title
-    placeholder: New page title
+    label: cms::lang.editor.title
+    placeholder: cms::lang.editor.new_title
     attributes:
       default-focus: 1
 
   settings[url]:
     span: right
     placeholder: /
-    label: URL
+    label: cms::lang.editor.url
     attributes:
       data-input-preset: 'input[name="settings[title]"]'
       data-input-preset-type: url
@@ -31,34 +31,34 @@ tabs:
     #   type: checkbox
 
     fileName:
-      tab: Settings
+      tab: cms::lang.editor.settings
       span: left
-      label: File Name
+      label: cms::lang.editor.filename
       attributes:
         data-input-preset: 'input[name="settings[title]"]'
         data-input-preset-type: file
         data-input-preset-closest-parent: form
 
     settings[layout]:
-      tab: Settings
+      tab: cms::lang.editor.settings
       span: right
-      label: Layout
+      label: cms::lang.editor.layout
       type: dropdown
       options: getLayoutOptions
 
     settings[description]:
-      tab: Settings
-      label: Description
+      tab: cms::lang.editor.settings
+      label: cms::lang.editor.description
       type: textarea
       size: tiny
 
     settings[meta_title]:
-      tab: Meta
-      label: Meta Title
+      tab: cms::lang.editor.meta
+      label: cms::lang.editor.meta_title
 
     settings[meta_description]:
-      tab: Meta
-      label: Meta Description
+      tab: cms::lang.editor.meta
+      label: cms::lang.editor.meta_description
       type: textarea
       size: tiny
 
@@ -66,14 +66,14 @@ secondaryTabs:
   stretch: true
   fields:
     markup:
-      tab: Markup
+      tab: cms::lang.editor.markup
       type: codeeditor
       stretch: true
       options:
         language: twig
 
     code:
-      tab: Code
+      tab: cms::lang.editor.code
       type: codeeditor
       stretch: true
       options:
diff --git a/modules/cms/classes/partial/fields.yaml b/modules/cms/classes/partial/fields.yaml
index 62c676792..cd233d2b1 100644
--- a/modules/cms/classes/partial/fields.yaml
+++ b/modules/cms/classes/partial/fields.yaml
@@ -1,13 +1,13 @@
 fields:
   fileName:
     span: left
-    label: File Name
+    label: cms::lang.editor.filename
     attributes:
       default-focus: 1
 
   settings[description]:
     span: right
-    label: Description
+    label: cms::lang.editor.description
 
   toolbar:
     type: partial
@@ -18,7 +18,7 @@ secondaryTabs:
   stretch: true
   fields:
     markup:
-      tab: Markup
+      tab: cms::lang.editor.markup
       type: codeeditor
       stretch: true
       options:
diff --git a/modules/cms/controllers/index/_page_toolbar.htm b/modules/cms/controllers/index/_page_toolbar.htm
index 86ba4f419..9b3b7ed46 100644
--- a/modules/cms/controllers/index/_page_toolbar.htm
+++ b/modules/cms/controllers/index/_page_toolbar.htm
@@ -6,7 +6,7 @@
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-hotkey="ctrl+s"
         data-hotkey-mac="cmd+s">
-            <?= e(trans('backend::lang.form.save')) ?>
+        <?= e(trans('backend::lang.form.save')) ?>
     </a>
 
     <?php
@@ -17,7 +17,7 @@
         target="_blank"
         class="btn btn-primary oc-icon-screenshot <?php if (!$templatePath): ?>hide<?php endif ?>"
         data-control="preview-button">
-        Preview
+        <?= e(trans('cms::lang.editor.preview')) ?>
     </a>
 
     <button
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 4f5a0ffc4..220dc11ef 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Add',
+        'search' => 'Search...'
+    ],
+    'editor' => [
+        'settings' => 'Settings',
+        'title' => 'Title',
+        'new_title' => 'Nieuwe paginatitel',
+        'url' => 'URL',
+        'filename' => 'File Name',
+        'layout' => 'Layout',
+        'description' => 'Description',
+        'preview' => 'Preview',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Assets",
         'drop_down_add_title' => 'Add...',
diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php
index 4cd93d964..0a59ce1d7 100644
--- a/modules/cms/lang/nl/lang.php
+++ b/modules/cms/lang/nl/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Toevoegen',
+        'search' => 'Zoeken...'
+    ],
+    'editor' => [
+        'settings' => 'Instellingen',
+        'title' => 'Titel',
+        'new_title' => 'Nieuwe paginatitel',
+        'url' => 'URL',
+        'filename' => 'Bestandsnaam',
+        'layout' => 'Layout',
+        'description' => 'Omschrijving',
+        'preview' => 'Voorbeeld',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Titel',
+        'meta_description' => 'Meta Omschrijving',
+        'markup' => 'Opmaak',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Middelen",
         'drop_down_add_title' => 'Toevoegen...',
diff --git a/modules/cms/widgets/assetlist/partials/_toolbar.htm b/modules/cms/widgets/assetlist/partials/_toolbar.htm
index db071273b..8ee6fef5c 100644
--- a/modules/cms/widgets/assetlist/partials/_toolbar.htm
+++ b/modules/cms/widgets/assetlist/partials/_toolbar.htm
@@ -7,7 +7,7 @@
                         <button type="button" class="btn btn-primary oc-icon-plus"
                             data-control="create-asset"
                             data-toggle="dropdown"
-                            >Add</button>
+                            ><?= e(trans('cms::lang.sidebar.add')) ?></button>
 
                         <ul class="dropdown-menu" role="menu" data-dropdown-title="<?= e(trans('cms::lang.asset.drop_down_add_title')) ?>">
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-control="create-template" class="oc-icon-file-text-o"><?= e(trans('cms::lang.asset.create_file')) ?></a></li>
@@ -60,7 +60,7 @@
         </div>
         <div class="layout-cell">
             <div class="relative toolbar-item loading-indicator-container size-input-text">
-                <input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
+                <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
                     class="form-control icon search" autocomplete="off"
                     data-track-input
                     data-load-indicator
diff --git a/modules/cms/widgets/componentlist/partials/_toolbar.htm b/modules/cms/widgets/componentlist/partials/_toolbar.htm
index a4b9a7efe..df06c51c8 100644
--- a/modules/cms/widgets/componentlist/partials/_toolbar.htm
+++ b/modules/cms/widgets/componentlist/partials/_toolbar.htm
@@ -2,7 +2,7 @@
     <div class="layout control-toolbar">
         <div class="layout-cell">
             <div class="relative toolbar-item loading-indicator-container size-input-text">
-                <input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
+                <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
                     class="form-control icon search" autocomplete="off"
                     data-track-input
                     data-load-indicator
diff --git a/modules/cms/widgets/templatelist/partials/_toolbar.htm b/modules/cms/widgets/templatelist/partials/_toolbar.htm
index 6d8a1d6d7..4ba49177f 100644
--- a/modules/cms/widgets/templatelist/partials/_toolbar.htm
+++ b/modules/cms/widgets/templatelist/partials/_toolbar.htm
@@ -5,7 +5,7 @@
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary oc-icon-plus last"
                         data-control="create-template"
-                        >Add</button>
+                        ><?= e(trans('cms::lang.sidebar.add')) ?></button>
                     <button type="button" class="btn btn-primary empty oc-icon-trash-o hide" 
                         id="<?= $this->getId('delete-button') ?>"
                         data-control="delete-template"
@@ -18,7 +18,7 @@
         </div>
         <div class="layout-cell">
             <div class="relative toolbar-item loading-indicator-container size-input-text">
-                <input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
+                <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
                     class="form-control icon search" autocomplete="off"
                     data-track-input
                     data-load-indicator
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index b43704742..671ce5bef 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -45,9 +45,11 @@ return [
     'email' => [
         'menu_label' => 'Email Configuration',
         'menu_description' => 'Manage email configuration.',
+        'general' => 'General',
         'method' => 'Email Method',
         'sender_name' => 'Sender Name',
         'sender_email' => 'Sender Email',
+        'smtp' => 'SMTP',
         'smtp_address' => 'SMTP Address',
         'smtp_authorization' => 'SMTP authorization required',
         'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
@@ -55,6 +57,7 @@ return [
         'smtp_password' => 'Password',
         'smtp_port' => 'SMTP Port',
         'smtp_ssl' => 'SSL connection required',
+        'sendmail' => 'Sendmail',
         'sendmail_path' => 'Sendmail Path',
         'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index b421c0f15..3a8aa7fea 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -45,9 +45,11 @@ return [
     'email' => [
         'menu_label' => 'E-mailinstellingen',
         'menu_description' => 'Beheer e-mailinstellingen.',
+        'general' => 'Algemeen',
         'method' => 'Email Methode',
         'sender_name' => 'Naam Afzender',
         'sender_email' => 'E-mailadres Afzender',
+        'smtp' => 'SMTP',
         'smtp_address' => 'SMTP Adres',
         'smtp_authorization' => 'SMTP authenticatie vereist',
         'smtp_authorization_comment' => 'Vink deze optie aan indien de SMTP server authenticatie vereist.',
@@ -55,6 +57,7 @@ return [
         'smtp_password' => 'Wachtwoord',
         'smtp_port' => 'SMTP Poort',
         'smtp_ssl' => 'SSL verbinding vereist',
+        'sendmail' => 'Sendmail',
         'sendmail_path' => 'Pad naar Sendmail',
         'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.',
     ],
diff --git a/modules/system/models/emailsettings/fields.yaml b/modules/system/models/emailsettings/fields.yaml
index 4d268a91b..3b7ab5c2e 100644
--- a/modules/system/models/emailsettings/fields.yaml
+++ b/modules/system/models/emailsettings/fields.yaml
@@ -8,48 +8,48 @@ tabs:
     send_mode:
       label: system::lang.email.method
       type: dropdown
-      tab: General
+      tab: system::lang.email.general
 
     sender_name:
       label: system::lang.email.sender_name
       span: auto
-      tab: General
+      tab: system::lang.email.general
 
     sender_email:
       label: system::lang.email.sender_email
       span: auto
-      tab: General
+      tab: system::lang.email.general
 
     smtp_address:
       label: system::lang.email.smtp_address
-      tab: SMTP
+      tab: system::lang.email.smtp
 
     smtp_authorization:
       type: checkbox
       label: system::lang.email.smtp_authorization
-      tab: SMTP
+      tab: system::lang.email.smtp
       comment: system::lang.email.smtp_authorization_comment
 
     smtp_user:
       label: system::lang.email.smtp_username
-      tab: SMTP
+      tab: system::lang.email.smtp
       span: left
 
     smtp_password:
       label: system::lang.email.smtp_password
-      tab: SMTP
+      tab: system::lang.email.smtp
       span: right
 
     smtp_port:
       label: system::lang.email.smtp_port
-      tab: SMTP
+      tab: system::lang.email.smtp
 
     smtp_ssl:
       type: checkbox
       label: system::lang.email.smtp_ssl
-      tab: SMTP
+      tab: system::lang.email.smtp
 
     sendmail_path:
       label: system::lang.email.sendmail_path
       commentAbove: system::lang.email.sendmail_path_comment
-      tab: Sendmail
\ No newline at end of file
+      tab: system::lang.email.sendmail
\ No newline at end of file

From b6b0b5ec4b243d8bf6695dc14888272efafb7553 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 09:07:27 +1000
Subject: [PATCH 18/24] Add licence to readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 5caab8032..186e97566 100644
--- a/README.md
+++ b/README.md
@@ -29,3 +29,7 @@ You can communicate with us using the following mediums:
 * [Follow us on Twitter](http://twitter.com/octobercms) for announcements and updates.
 * [Follow us on Facebook](http://facebook.com/octobercms) for announcements and updates.
 * [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/?nick=Octonaut|?#october) to chat with us.
+
+### License
+
+The OctoberCMS platform is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
\ No newline at end of file

From 6cab8a0c5635f3d53e5fb70f9e3581c356a18578 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 10:01:50 +1000
Subject: [PATCH 19/24] Add helpful RewriteBase comment to .htaccess

---
 .htaccess | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index a18974474..c783fea3b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,7 +4,12 @@
     </IfModule>
 
     RewriteEngine On
-    RewriteBase /
+
+    ##
+    ## You may need to uncomment the following line for some hosting environments,
+    ## if you have installed to a subdirectory, enter the name here also.
+    ##
+    # RewriteBase /
 
     ##
     ## Handle resource requests

From f30eefd04ad0f2bab319020b58cce2b9101c91ce Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 10:32:04 +1000
Subject: [PATCH 20/24] Fixes active menu selection on demo Fixes
 https://github.com/octobercms/october/issues/65

---
 themes/demo/assets/css/theme.css         | 2051 ++++++++++------------
 themes/demo/assets/less/theme/fonts.less |   10 +
 themes/demo/layouts/default.htm          |    8 +-
 themes/demo/partials/calcresult.htm      |   12 +-
 4 files changed, 939 insertions(+), 1142 deletions(-)

diff --git a/themes/demo/assets/css/theme.css b/themes/demo/assets/css/theme.css
index 7a82c27f5..d9fe365fe 100644
--- a/themes/demo/assets/css/theme.css
+++ b/themes/demo/assets/css/theme.css
@@ -9,7 +9,15 @@
  * !! YOU HAVE BEEN WARNED !! MODIFY THIS FILE AT YOUR OWN RISK !!
  *
  */
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -26,8 +34,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -37,28 +47,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -69,28 +64,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -114,28 +95,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -152,11 +139,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -167,19 +166,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -216,9 +225,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page  {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -254,7 +260,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -290,10 +300,13 @@ a:focus {
   text-decoration: underline;
 }
 a:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -336,69 +349,6 @@ hr {
   clip: rect(0, 0, 0, 0);
   border: 0;
 }
-p {
-  margin: 0 0 10px;
-}
-.lead {
-  margin-bottom: 20px;
-  font-size: 16px;
-  font-weight: 200;
-  line-height: 1.4;
-}
-@media (min-width: 768px) {
-  .lead {
-    font-size: 21px;
-  }
-}
-small,
-.small {
-  font-size: 85%;
-}
-cite {
-  font-style: normal;
-}
-.text-muted {
-  color: #999999;
-}
-.text-primary {
-  color: #428bca;
-}
-.text-primary:hover {
-  color: #3071a9;
-}
-.text-warning {
-  color: #c09853;
-}
-.text-warning:hover {
-  color: #a47e3c;
-}
-.text-danger {
-  color: #b94a48;
-}
-.text-danger:hover {
-  color: #953b39;
-}
-.text-success {
-  color: #468847;
-}
-.text-success:hover {
-  color: #356635;
-}
-.text-info {
-  color: #3a87ad;
-}
-.text-info:hover {
-  color: #2d6987;
-}
-.text-left {
-  text-align: left;
-}
-.text-right {
-  text-align: right;
-}
-.text-center {
-  text-align: center;
-}
 h1,
 h2,
 h3,
@@ -411,7 +361,7 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: "lato", sans-serif;
+  font-family: inherit;
   font-weight: 500;
   line-height: 1.1;
   color: inherit;
@@ -445,31 +395,49 @@ h6 .small,
   color: #999999;
 }
 h1,
+.h1,
 h2,
-h3 {
+.h2,
+h3,
+.h3 {
   margin-top: 20px;
   margin-bottom: 10px;
 }
 h1 small,
+.h1 small,
 h2 small,
+.h2 small,
 h3 small,
+.h3 small,
 h1 .small,
+.h1 .small,
 h2 .small,
-h3 .small {
+.h2 .small,
+h3 .small,
+.h3 .small {
   font-size: 65%;
 }
 h4,
+.h4,
 h5,
-h6 {
+.h5,
+h6,
+.h6 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 h4 small,
+.h4 small,
 h5 small,
+.h5 small,
 h6 small,
+.h6 small,
 h4 .small,
+.h4 .small,
 h5 .small,
-h6 .small {
+.h5 .small,
+h6 .small,
+.h6 .small {
   font-size: 75%;
 }
 h1,
@@ -496,6 +464,103 @@ h6,
 .h6 {
   font-size: 12px;
 }
+p {
+  margin: 0 0 10px;
+}
+.lead {
+  margin-bottom: 20px;
+  font-size: 16px;
+  font-weight: 200;
+  line-height: 1.4;
+}
+@media (min-width: 768px) {
+  .lead {
+    font-size: 21px;
+  }
+}
+small,
+.small {
+  font-size: 85%;
+}
+cite {
+  font-style: normal;
+}
+.text-left {
+  text-align: left;
+}
+.text-right {
+  text-align: right;
+}
+.text-center {
+  text-align: center;
+}
+.text-justify {
+  text-align: justify;
+}
+.text-muted {
+  color: #999999;
+}
+.text-primary {
+  color: #428bca;
+}
+a.text-primary:hover {
+  color: #3071a9;
+}
+.text-success {
+  color: #3c763d;
+}
+a.text-success:hover {
+  color: #2b542c;
+}
+.text-info {
+  color: #31708f;
+}
+a.text-info:hover {
+  color: #245269;
+}
+.text-warning {
+  color: #8a6d3b;
+}
+a.text-warning:hover {
+  color: #66512c;
+}
+.text-danger {
+  color: #a94442;
+}
+a.text-danger:hover {
+  color: #843534;
+}
+.bg-primary {
+  color: #fff;
+  background-color: #428bca;
+}
+a.bg-primary:hover {
+  background-color: #3071a9;
+}
+.bg-success {
+  background-color: #dff0d8;
+}
+a.bg-success:hover {
+  background-color: #c1e2b3;
+}
+.bg-info {
+  background-color: #d9edf7;
+}
+a.bg-info:hover {
+  background-color: #afd9ee;
+}
+.bg-warning {
+  background-color: #fcf8e3;
+}
+a.bg-warning:hover {
+  background-color: #f7ecb5;
+}
+.bg-danger {
+  background-color: #f2dede;
+}
+a.bg-danger:hover {
+  background-color: #e4b9b9;
+}
 .page-header {
   padding-bottom: 9px;
   margin: 40px 0 20px;
@@ -529,6 +594,7 @@ ol ol {
   padding-left: 0;
 }
 dl {
+  margin-top: 0;
   margin-bottom: 20px;
 }
 dt,
@@ -554,77 +620,61 @@ dd {
   .dl-horizontal dd {
     margin-left: 180px;
   }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    content: " ";
-    /* 1 */
-  
-    display: table;
-    /* 2 */
-  
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    content: " ";
-    /* 1 */
-  
-    display: table;
-    /* 2 */
-  
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
 }
 abbr[title],
 abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted #999999;
 }
-abbr.initialism {
+.initialism {
   font-size: 90%;
   text-transform: uppercase;
 }
 blockquote {
   padding: 10px 20px;
   margin: 0 0 20px;
+  font-size: 17.5px;
   border-left: 5px solid #eeeeee;
 }
-blockquote p {
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-blockquote p:last-child {
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
   margin-bottom: 0;
 }
-blockquote small {
+blockquote footer,
+blockquote small,
+blockquote .small {
   display: block;
+  font-size: 80%;
   line-height: 1.428571429;
   color: #999999;
 }
-blockquote small:before {
+blockquote footer:before,
+blockquote small:before,
+blockquote .small:before {
   content: '\2014 \00A0';
 }
+.blockquote-reverse,
 blockquote.pull-right {
   padding-right: 15px;
   padding-left: 0;
   border-right: 5px solid #eeeeee;
   border-left: 0;
-}
-blockquote.pull-right p,
-blockquote.pull-right small,
-blockquote.pull-right .small {
   text-align: right;
 }
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
 blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
 blockquote.pull-right .small:before {
   content: '';
 }
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
 blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
 blockquote.pull-right .small:after {
   content: '\00A0 \2014';
 }
@@ -641,7 +691,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 code {
   padding: 2px 4px;
@@ -651,6 +701,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -682,65 +740,38 @@ pre code {
   padding-left: 15px;
   padding-right: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
+@media (min-width: 768px) {
+  .container {
+    width: 750px;
+  }
 }
-.container:after {
-  clear: both;
+@media (min-width: 992px) {
+  .container {
+    width: 970px;
+  }
 }
-.container:before,
-.container:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
+@media (min-width: 1200px) {
+  .container {
+    width: 1170px;
+  }
 }
-.container:after {
-  clear: both;
+.container-fluid {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 15px;
+  padding-right: 15px;
 }
 .row {
   margin-left: -15px;
   margin-right: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
   padding-left: 15px;
   padding-right: 15px;
 }
-.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11 {
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
   float: left;
 }
 .col-xs-12 {
@@ -897,10 +928,7 @@ pre code {
   margin-left: 0%;
 }
 @media (min-width: 768px) {
-  .container {
-    width: 750px;
-  }
-  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11 {
+  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
     float: left;
   }
   .col-sm-12 {
@@ -1058,10 +1086,7 @@ pre code {
   }
 }
 @media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11 {
+  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
     float: left;
   }
   .col-md-12 {
@@ -1219,10 +1244,7 @@ pre code {
   }
 }
 @media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
-  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11 {
+  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
     float: left;
   }
   .col-lg-12 {
@@ -1451,11 +1473,13 @@ th {
   background-color: #f5f5f5;
 }
 table col[class*="col-"] {
+  position: static;
   float: none;
   display: table-column;
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
@@ -1473,6 +1497,12 @@ table th[class*="col-"] {
 .table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
+  background-color: #e8e8e8;
+}
 .table > thead > tr > td.success,
 .table > tbody > tr > td.success,
 .table > tfoot > tr > td.success,
@@ -1493,25 +1523,25 @@ table th[class*="col-"] {
 .table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > td.danger,
-.table > tbody > tr > td.danger,
-.table > tfoot > tr > td.danger,
-.table > thead > tr > th.danger,
-.table > tbody > tr > th.danger,
-.table > tfoot > tr > th.danger,
-.table > thead > tr.danger > td,
-.table > tbody > tr.danger > td,
-.table > tfoot > tr.danger > td,
-.table > thead > tr.danger > th,
-.table > tbody > tr.danger > th,
-.table > tfoot > tr.danger > th {
-  background-color: #f2dede;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td,
-.table-hover > tbody > tr.danger:hover > th {
-  background-color: #ebcccc;
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
 }
 .table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
@@ -1533,6 +1563,26 @@ table th[class*="col-"] {
 .table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1584,6 +1634,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1611,39 +1662,32 @@ input[type="checkbox"] {
   margin: 4px 0 0;
   margin-top: 1px \9;
   /* IE8-9 */
-
   line-height: normal;
 }
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1653,7 +1697,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -1674,6 +1717,7 @@ output {
 }
 .form-control::-moz-placeholder {
   color: #999999;
+  opacity: 1;
 }
 .form-control:-ms-input-placeholder {
   color: #999999;
@@ -1686,10 +1730,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -1700,12 +1748,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -1759,68 +1805,40 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
-  height: 45px;
+  height: 46px;
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
 select.input-lg {
-  height: 45px;
-  line-height: 45px;
+  height: 46px;
+  line-height: 46px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline {
-  color: #c09853;
+.has-feedback {
+  position: relative;
 }
-.has-warning .form-control {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.has-feedback .form-control {
+  padding-right: 42.5px;
 }
-.has-warning .form-control:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-.has-warning .input-group-addon {
-  color: #c09853;
-  border-color: #c09853;
-  background-color: #fcf8e3;
-}
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline {
-  color: #b94a48;
-}
-.has-error .form-control {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-error .form-control:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-.has-error .input-group-addon {
-  color: #b94a48;
-  border-color: #b94a48;
-  background-color: #f2dede;
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  right: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
 }
 .has-success .help-block,
 .has-success .control-label,
@@ -1828,23 +1846,78 @@ textarea.input-lg {
 .has-success .checkbox,
 .has-success .radio-inline,
 .has-success .checkbox-inline {
-  color: #468847;
+  color: #3c763d;
 }
 .has-success .form-control {
-  border-color: #468847;
+  border-color: #3c763d;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
 }
 .has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
+  color: #3c763d;
+  border-color: #3c763d;
   background-color: #dff0d8;
 }
+.has-success .form-control-feedback {
+  color: #3c763d;
+}
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline {
+  color: #8a6d3b;
+}
+.has-warning .form-control {
+  border-color: #8a6d3b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-warning .form-control:focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+}
+.has-warning .input-group-addon {
+  color: #8a6d3b;
+  border-color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+.has-warning .form-control-feedback {
+  color: #8a6d3b;
+}
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline {
+  color: #a94442;
+}
+.has-error .form-control {
+  border-color: #a94442;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-error .form-control:focus {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+}
+.has-error .input-group-addon {
+  color: #a94442;
+  border-color: #a94442;
+  background-color: #f2dede;
+}
+.has-error .form-control-feedback {
+  color: #a94442;
+}
 .form-control-static {
   margin-bottom: 0;
 }
@@ -1862,6 +1935,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -1869,12 +1948,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -1885,34 +1968,14 @@ textarea.input-lg {
   margin-bottom: 0;
   padding-top: 7px;
 }
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+  min-height: 27px;
+}
 .form-horizontal .form-group {
   margin-left: -15px;
   margin-right: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -1921,6 +1984,10 @@ textarea.input-lg {
     text-align: right;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  right: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -1942,7 +2009,7 @@ textarea.input-lg {
   user-select: none;
 }
 .btn:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -2005,6 +2072,10 @@ fieldset[disabled] .btn-default.active {
   background-color: #ffffff;
   border-color: #cccccc;
 }
+.btn-default .badge {
+  color: #ffffff;
+  background-color: #333333;
+}
 .btn-primary {
   color: #ffffff;
   background-color: #428bca;
@@ -2042,79 +2113,9 @@ fieldset[disabled] .btn-primary.active {
   background-color: #428bca;
   border-color: #357ebd;
 }
-.btn-warning {
-  color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
+.btn-primary .badge {
+  color: #428bca;
+  background-color: #ffffff;
 }
 .btn-success {
   color: #ffffff;
@@ -2153,6 +2154,10 @@ fieldset[disabled] .btn-success.active {
   background-color: #5cb85c;
   border-color: #4cae4c;
 }
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #ffffff;
+}
 .btn-info {
   color: #ffffff;
   background-color: #5bc0de;
@@ -2190,6 +2195,92 @@ fieldset[disabled] .btn-info.active {
   background-color: #5bc0de;
   border-color: #46b8da;
 }
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
+}
 .btn-link {
   color: #428bca;
   font-weight: normal;
@@ -2229,8 +2320,7 @@ fieldset[disabled] .btn-link:focus {
   line-height: 1.33;
   border-radius: 6px;
 }
-.btn-sm,
-.btn-xs {
+.btn-sm {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
@@ -2238,6 +2328,9 @@ fieldset[disabled] .btn-link:focus {
 }
 .btn-xs {
   padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
 .btn-block {
   display: block;
@@ -2280,10 +2373,9 @@ input[type="button"].btn-block {
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top: 4px solid #000000;
+  border-top: 4px solid;
   border-right: 4px solid transparent;
   border-left: 4px solid transparent;
-  border-bottom: 0 dotted;
 }
 .dropdown {
   position: relative;
@@ -2363,6 +2455,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -2384,8 +2484,8 @@ input[type="button"].btn-block {
 }
 .dropup .caret,
 .navbar-fixed-bottom .dropdown .caret {
-  border-top: 0 dotted;
-  border-bottom: 4px solid #000000;
+  border-top: 0;
+  border-bottom: 4px solid;
   content: "";
 }
 .dropup .dropdown-menu,
@@ -2396,29 +2496,13 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    right: 0;
     left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
   }
-}
-.btn-default .caret {
-  border-top-color: #333333;
-}
-.btn-primary .caret,
-.btn-success .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret {
-  border-top-color: #fff;
-}
-.dropup .btn-default .caret {
-  border-bottom-color: #333333;
-}
-.dropup .btn-primary .caret,
-.dropup .btn-success .caret,
-.dropup .btn-warning .caret,
-.dropup .btn-danger .caret,
-.dropup .btn-info .caret {
-  border-bottom-color: #fff;
 }
 .btn-group,
 .btn-group-vertical {
@@ -2451,37 +2535,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
+.btn-toolbar {
+  margin-left: -5px;
 }
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: left;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-left: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -2519,11 +2582,10 @@ input[type="button"].btn-block {
   outline: 0;
 }
 .btn-group-xs > .btn {
-  padding: 5px 10px;
+  padding: 1px 5px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
-  padding: 1px 5px;
 }
 .btn-group-sm > .btn {
   padding: 5px 10px;
@@ -2564,36 +2626,13 @@ input[type="button"].btn-block {
   border-width: 0 5px 5px;
 }
 .btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group {
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
   display: block;
   float: none;
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -2620,12 +2659,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
@@ -2635,11 +2674,15 @@ input[type="button"].btn-block {
   table-layout: fixed;
   border-collapse: separate;
 }
-.btn-group-justified .btn {
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
   float: none;
   display: table-cell;
   width: 1%;
 }
+.btn-group-justified > .btn-group .btn {
+  width: 100%;
+}
 [data-toggle="buttons"] > .btn > input[type="radio"],
 [data-toggle="buttons"] > .btn > input[type="checkbox"] {
   display: none;
@@ -2649,19 +2692,20 @@ input[type="button"].btn-block {
   display: table;
   border-collapse: separate;
 }
-.input-group.col {
+.input-group[class*="col-"] {
   float: none;
   padding-left: 0;
   padding-right: 0;
 }
 .input-group .form-control {
+  float: left;
   width: 100%;
   margin-bottom: 0;
 }
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 45px;
+  height: 46px;
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
@@ -2670,12 +2714,15 @@ input[type="button"].btn-block {
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 45px;
-  line-height: 45px;
+  height: 46px;
+  line-height: 46px;
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -2695,7 +2742,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -2742,8 +2792,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -2753,8 +2805,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -2763,53 +2817,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-left: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-left: -4px;
+  margin-left: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -2840,12 +2874,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   background-color: #eeeeee;
   border-color: #428bca;
 }
-.nav .open > a .caret,
-.nav .open > a:hover .caret,
-.nav .open > a:focus .caret {
-  border-top-color: #2a6496;
-  border-bottom-color: #2a6496;
-}
 .nav .nav-divider {
   height: 1px;
   margin: 9px 0;
@@ -2939,12 +2967,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   color: #ffffff;
   background-color: #428bca;
 }
-.nav-pills > li.active > a .caret,
-.nav-pills > li.active > a:hover .caret,
-.nav-pills > li.active > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
 .nav-stacked > li {
   float: none;
 }
@@ -3004,14 +3026,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .tab-content > .active {
   display: block;
 }
-.nav .caret {
-  border-top-color: #428bca;
-  border-bottom-color: #428bca;
-}
-.nav a:hover .caret {
-  border-top-color: #2a6496;
-  border-bottom-color: #2a6496;
-}
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-right-radius: 0;
@@ -3023,59 +3037,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: left;
@@ -3090,30 +3056,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.navbar-collapse:after {
-  clear: both;
-}
 .navbar-collapse.in {
   overflow-y: auto;
 }
@@ -3130,26 +3072,27 @@ textarea.input-group-sm > .input-group-btn > .btn {
     overflow: visible !important;
   }
   .navbar-collapse.in {
-    overflow-y: auto;
+    overflow-y: visible;
   }
-  .navbar-collapse .navbar-nav.navbar-left:first-child {
-    margin-left: -15px;
-  }
-  .navbar-collapse .navbar-nav.navbar-right:last-child {
-    margin-right: -15px;
-  }
-  .navbar-collapse .navbar-text:last-child {
-    margin-right: 0;
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-static-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    padding-left: 0;
+    padding-right: 0;
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-right: -15px;
   margin-left: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-right: 0;
     margin-left: 0;
   }
@@ -3190,13 +3133,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 50px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
   }
 }
@@ -3208,9 +3153,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-top: 8px;
   margin-bottom: 8px;
   background-color: transparent;
+  background-image: none;
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -3267,6 +3216,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
     padding-top: 15px;
     padding-bottom: 15px;
   }
+  .navbar-nav.navbar-right:last-child {
+    margin-right: -15px;
+  }
 }
 @media (min-width: 768px) {
   .navbar-left {
@@ -3297,6 +3249,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -3304,12 +3262,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -3327,6 +3289,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
     -webkit-box-shadow: none;
     box-shadow: none;
   }
+  .navbar-form.navbar-right:last-child {
+    margin-right: -15px;
+  }
 }
 .navbar-nav > li > .dropdown-menu {
   margin-top: 0;
@@ -3337,25 +3302,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
 }
+.navbar-btn.btn-sm {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.navbar-btn.btn-xs {
+  margin-top: 14px;
+  margin-bottom: 14px;
+}
 .navbar-text {
-  float: left;
   margin-top: 15px;
   margin-bottom: 15px;
 }
 @media (min-width: 768px) {
   .navbar-text {
+    float: left;
     margin-left: 15px;
     margin-right: 15px;
   }
+  .navbar-text.navbar-right:last-child {
+    margin-right: 0;
+  }
 }
 .navbar-default {
   background-color: #f8f8f8;
@@ -3400,33 +3371,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
   background-color: #dddddd;
 }
 .navbar-default .navbar-toggle .icon-bar {
-  background-color: #cccccc;
+  background-color: #888888;
 }
 .navbar-default .navbar-collapse,
 .navbar-default .navbar-form {
   border-color: #e7e7e7;
 }
-.navbar-default .navbar-nav > .dropdown > a:hover .caret,
-.navbar-default .navbar-nav > .dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
-}
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus {
   background-color: #e7e7e7;
   color: #555555;
 }
-.navbar-default .navbar-nav > .open > a .caret,
-.navbar-default .navbar-nav > .open > a:hover .caret,
-.navbar-default .navbar-nav > .open > a:focus .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-.navbar-default .navbar-nav > .dropdown > a .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
 @media (max-width: 767px) {
   .navbar-default .navbar-nav .open .dropdown-menu > li > a {
     color: #777777;
@@ -3510,24 +3466,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
   background-color: #080808;
   color: #ffffff;
 }
-.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-.navbar-inverse .navbar-nav > .dropdown > a .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-.navbar-inverse .navbar-nav > .open > a .caret,
-.navbar-inverse .navbar-nav > .open > a:hover .caret,
-.navbar-inverse .navbar-nav > .open > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
 @media (max-width: 767px) {
   .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
     border-color: #080808;
   }
+  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+    background-color: #080808;
+  }
   .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
     color: #999999;
   }
@@ -3589,6 +3534,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #428bca;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-left: -1px;
@@ -3608,7 +3554,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #2a6496;
   background-color: #eeeeee;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -3669,30 +3617,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -3746,6 +3670,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .label:empty {
   display: none;
 }
+.btn .label {
+  position: relative;
+  top: -1px;
+}
 .label-default {
   background-color: #999999;
 }
@@ -3805,16 +3733,20 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .badge:empty {
   display: none;
 }
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
   text-decoration: none;
   cursor: pointer;
 }
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
   color: #428bca;
@@ -3826,22 +3758,24 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #eeeeee;
 }
-.jumbotron h1 {
-  line-height: 1;
+.jumbotron h1,
+.jumbotron .h1 {
   color: inherit;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
 }
+.jumbotron .container {
+  max-width: 100%;
+}
 @media screen and (min-width: 768px) {
   .jumbotron {
     padding-top: 48px;
@@ -3851,25 +3785,24 @@ a.list-group-item.active > .badge,
     padding-left: 60px;
     padding-right: 60px;
   }
-  .jumbotron h1 {
+  .jumbotron h1,
+  .jumbotron .h1 {
     font-size: 63px;
   }
 }
 .thumbnail {
+  display: block;
   padding: 4px;
+  margin-bottom: 20px;
   line-height: 1.428571429;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   border-radius: 4px;
   -webkit-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
-  display: inline-block;
-  max-width: 100%;
-  height: auto;
-  display: block;
-  margin-bottom: 20px;
 }
-.thumbnail > img {
+.thumbnail > img,
+.thumbnail a > img {
   display: block;
   max-width: 100%;
   height: auto;
@@ -3917,46 +3850,46 @@ a.thumbnail.active {
 .alert-success {
   background-color: #dff0d8;
   border-color: #d6e9c6;
-  color: #468847;
+  color: #3c763d;
 }
 .alert-success hr {
   border-top-color: #c9e2b3;
 }
 .alert-success .alert-link {
-  color: #356635;
+  color: #2b542c;
 }
 .alert-info {
   background-color: #d9edf7;
   border-color: #bce8f1;
-  color: #3a87ad;
+  color: #31708f;
 }
 .alert-info hr {
   border-top-color: #a6e1ec;
 }
 .alert-info .alert-link {
-  color: #2d6987;
+  color: #245269;
 }
 .alert-warning {
   background-color: #fcf8e3;
   border-color: #faebcc;
-  color: #c09853;
+  color: #8a6d3b;
 }
 .alert-warning hr {
   border-top-color: #f7e1b5;
 }
 .alert-warning .alert-link {
-  color: #a47e3c;
+  color: #66512c;
 }
 .alert-danger {
   background-color: #f2dede;
   border-color: #ebccd1;
-  color: #b94a48;
+  color: #a94442;
 }
 .alert-danger hr {
   border-top-color: #e4b9c0;
 }
 .alert-danger .alert-link {
-  color: #953b39;
+  color: #843534;
 }
 @-webkit-keyframes progress-bar-stripes {
   from {
@@ -3966,22 +3899,6 @@ a.thumbnail.active {
     background-position: 0 0;
   }
 }
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
 @keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
@@ -4014,9 +3931,7 @@ a.thumbnail.active {
   transition: width 0.6s ease;
 }
 .progress-striped .progress-bar {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-size: 40px 40px;
 }
@@ -4028,36 +3943,28 @@ a.thumbnail.active {
   background-color: #5cb85c;
 }
 .progress-striped .progress-bar-success {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-info {
   background-color: #5bc0de;
 }
 .progress-striped .progress-bar-info {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-warning {
   background-color: #f0ad4e;
 }
 .progress-striped .progress-bar-warning {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-danger {
   background-color: #d9534f;
 }
 .progress-striped .progress-bar-danger {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .media,
@@ -4144,6 +4051,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #e1edf7;
 }
+.list-group-item-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #3c763d;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #3c763d;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #3c763d;
+  border-color: #3c763d;
+}
+.list-group-item-info {
+  color: #31708f;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #31708f;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #31708f;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #31708f;
+  border-color: #31708f;
+}
+.list-group-item-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #8a6d3b;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #8a6d3b;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #8a6d3b;
+  border-color: #8a6d3b;
+}
+.list-group-item-danger {
+  color: #a94442;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #a94442;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #a94442;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #a94442;
+  border-color: #a94442;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -4163,54 +4158,82 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
 .panel > .table,
-.panel > .table-responsive {
+.panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
+  border-top: 0;
+}
 .panel > .table-bordered,
 .panel > .table-responsive > .table-bordered {
   border: 0;
@@ -4243,6 +4266,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-right: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -4257,6 +4294,10 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
   border-bottom: 0;
 }
+.panel > .table-responsive {
+  border: 0;
+  margin-bottom: 0;
+}
 .panel-heading {
   padding: 10px 15px;
   border-bottom: 1px solid transparent;
@@ -4270,6 +4311,7 @@ a.list-group-item.active:focus .list-group-item-text {
   margin-top: 0;
   margin-bottom: 0;
   font-size: 16px;
+  color: inherit;
 }
 .panel-title > a {
   color: inherit;
@@ -4281,6 +4323,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -4312,9 +4357,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-default > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #dddddd;
 }
-.panel-default > .panel-heading > .dropdown .caret {
-  border-color: #333333 transparent;
-}
 .panel-default > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #dddddd;
 }
@@ -4329,9 +4371,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-primary > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #428bca;
 }
-.panel-primary > .panel-heading > .dropdown .caret {
-  border-color: #ffffff transparent;
-}
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #428bca;
 }
@@ -4339,33 +4378,41 @@ a.list-group-item.active:focus .list-group-item-text {
   border-color: #d6e9c6;
 }
 .panel-success > .panel-heading {
-  color: #468847;
+  color: #3c763d;
   background-color: #dff0d8;
   border-color: #d6e9c6;
 }
 .panel-success > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #d6e9c6;
 }
-.panel-success > .panel-heading > .dropdown .caret {
-  border-color: #468847 transparent;
-}
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
 .panel-warning > .panel-heading {
-  color: #c09853;
+  color: #8a6d3b;
   background-color: #fcf8e3;
   border-color: #faebcc;
 }
 .panel-warning > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #faebcc;
 }
-.panel-warning > .panel-heading > .dropdown .caret {
-  border-color: #c09853 transparent;
-}
 .panel-warning > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #faebcc;
 }
@@ -4373,36 +4420,16 @@ a.list-group-item.active:focus .list-group-item-text {
   border-color: #ebccd1;
 }
 .panel-danger > .panel-heading {
-  color: #b94a48;
+  color: #a94442;
   background-color: #f2dede;
   border-color: #ebccd1;
 }
 .panel-danger > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #ebccd1;
 }
-.panel-danger > .panel-heading > .dropdown .caret {
-  border-color: #b94a48 transparent;
-}
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-heading > .dropdown .caret {
-  border-color: #3a87ad transparent;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -4462,7 +4489,9 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -4480,11 +4509,8 @@ button.close {
 }
 .modal-dialog {
   position: relative;
-  margin-left: auto;
-  margin-right: auto;
   width: auto;
-  padding: 10px;
-  z-index: 1050;
+  margin: 10px;
 }
 .modal-content {
   position: relative;
@@ -4503,7 +4529,7 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -4536,30 +4562,6 @@ button.close {
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  /* 1 */
-
-  display: table;
-  /* 2 */
-
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-left: 5px;
   margin-bottom: 0;
@@ -4570,16 +4572,21 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-left: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
-    padding-top: 30px;
-    padding-bottom: 30px;
+    margin: 30px auto;
   }
   .modal-content {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -4863,9 +4870,7 @@ button.close {
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
 }
 .carousel-control.left {
-  background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001)));
   background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%));
-  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
   background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
@@ -4873,15 +4878,14 @@ button.close {
 .carousel-control.right {
   left: auto;
   right: 0;
-  background-image: -webkit-gradient(linear, 0% top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5)));
   background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%));
-  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
   background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
 }
 .carousel-control:hover,
 .carousel-control:focus {
+  outline: none;
   color: #ffffff;
   text-decoration: none;
   opacity: 0.9;
@@ -4983,15 +4987,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
-  /* 1 */
-
   display: table;
-  /* 2 */
-
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5041,6 +5080,9 @@ td.visible-xs {
   .visible-xs {
     display: block !important;
   }
+  table.visible-xs {
+    display: table;
+  }
   tr.visible-xs {
     display: table-row !important;
   }
@@ -5049,64 +5091,19 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
   }
+  table.visible-sm {
+    display: table;
+  }
   tr.visible-sm {
     display: table-row !important;
   }
@@ -5115,64 +5112,19 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
   }
+  table.visible-md {
+    display: table;
+  }
   tr.visible-md {
     display: table-row !important;
   }
@@ -5181,64 +5133,19 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
   }
+  table.visible-lg {
+    display: table;
+  }
   tr.visible-lg {
     display: table-row !important;
   }
@@ -5247,16 +5154,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -5265,48 +5162,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -5315,48 +5170,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -5365,48 +5178,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -5425,6 +5196,9 @@ td.visible-print {
   .visible-print {
     display: block !important;
   }
+  table.visible-print {
+    display: table;
+  }
   tr.visible-print {
     display: table-row !important;
   }
@@ -5432,6 +5206,8 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
@@ -6921,6 +6697,11 @@ a .icon-flip-vertical:before {
   font-weight: 300;
   font-style: normal;
 }
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  select {
+    font-family: sans-serif;
+  }
+}
 body {
   padding-top: 50px;
 }
@@ -6935,7 +6716,6 @@ header#layout-header .navbar-brand {
   margin-bottom: 20px;
   padding: 20px;
   border-left: 3px solid #eeeeee;
-  border-radius: 4px;
 }
 .callout h4 {
   margin-top: 0;
@@ -6949,19 +6729,26 @@ header#layout-header .navbar-brand {
   border-color: #ebccd1;
 }
 .callout-danger h4 {
-  color: #b94a48;
+  color: #a94442;
 }
 .callout-warning {
   background-color: #faf8f0;
   border-color: #faebcc;
 }
 .callout-warning h4 {
-  color: #c09853;
+  color: #8a6d3b;
 }
 .callout-info {
   background-color: #f4f8fa;
   border-color: #bce8f1;
 }
 .callout-info h4 {
-  color: #3a87ad;
+  color: #31708f;
+}
+.callout-success {
+  background-color: #f9fdf7;
+  border-color: #d6e9c6;
+}
+.callout-success h4 {
+  color: #3c763d;
 }
diff --git a/themes/demo/assets/less/theme/fonts.less b/themes/demo/assets/less/theme/fonts.less
index 370fbe046..9e2a2aa32 100644
--- a/themes/demo/assets/less/theme/fonts.less
+++ b/themes/demo/assets/less/theme/fonts.less
@@ -46,4 +46,14 @@
          url('../fonts/lato-light-webfont.ttf') format('truetype');
     font-weight: 300;
     font-style: normal;
+}
+
+//
+// Chrome exhibits strange behavior when custom fonts are used
+// on select inputs. This fixes the garbled text.
+//
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    select {
+        font-family: sans-serif;
+    }
 }
\ No newline at end of file
diff --git a/themes/demo/layouts/default.htm b/themes/demo/layouts/default.htm
index d89c0819d..68260361c 100644
--- a/themes/demo/layouts/default.htm
+++ b/themes/demo/layouts/default.htm
@@ -31,9 +31,9 @@ description = "Default layout"
                     </div>
                     <div class="collapse navbar-collapse navbar-main-collapse">
                         <ul class="nav navbar-nav">
-                            <li class="{% if page.url == '/' %}active{% endif %}"><a href="{{ 'home'|page }}">Basic concepts</a></li>
-                            <li class="{% if page.url == '/ajax' %}active{% endif %}"><a href="{{ 'ajax'|page }}">AJAX framework</a></li>
-                            <li class="{% if page.url == '/plugins' %}active{% endif %}"><a href="{{ 'plugins'|page }}">Plugin components</a></li>
+                            <li class="{% if this.page.id == 'home' %}active{% endif %}"><a href="{{ 'home'|page }}">Basic concepts</a></li>
+                            <li class="{% if this.page.id == 'ajax' %}active{% endif %}"><a href="{{ 'ajax'|page }}">AJAX framework</a></li>
+                            <li class="{% if this.page.id == 'plugins' %}active{% endif %}"><a href="{{ 'plugins'|page }}">Plugin components</a></li>
                         </ul>
                     </div>
                 </div>
@@ -53,7 +53,7 @@ description = "Default layout"
 
         <!-- Scripts -->
         <script src="{{ [
-            'assets/javascript/jquery.js', 
+            'assets/javascript/jquery.js',
             'assets/javascript/app.js'
         ]|theme }}"></script>
         {% framework extras %}
diff --git a/themes/demo/partials/calcresult.htm b/themes/demo/partials/calcresult.htm
index da24555d2..5551575d2 100644
--- a/themes/demo/partials/calcresult.htm
+++ b/themes/demo/partials/calcresult.htm
@@ -1,9 +1,9 @@
 {% if result %}
-	<span class="lead">
-		The result is <span class="label label-success">{{ result }}</span>
-	</span>
+    <span class="lead">
+        The result is <span class="label label-success">{{ result }}</span>
+    </span>
 {% else %}
-	<span class="text-muted">
-		Click the <em>Calculate</em> button to find the answer.
-	</span>
+    <span class="text-muted">
+        Click the <em>Calculate</em> button to find the answer.
+    </span>
 {% endif %}
\ No newline at end of file

From f3827e230f40558e51785d5fb86fc20bfeef2e4a Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 11:04:46 +1000
Subject: [PATCH 21/24] Minor clean up

---
 modules/system/traits/AssetMaker.php | 62 +++++++++++-----------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index 41676ce55..1d499d253 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -38,40 +38,37 @@ trait AssetMaker
 
         if ($type == null || $type == 'css'){
             foreach ($this->assets['css'] as $asset) {
-                $attributes = HTML::attributes(array_merge(
-                    [
-                        'rel' => 'stylesheet',
-                        'href' => $asset['path']
-                    ],
-                    $asset['attributes'])
-                );
+
+                $attributes = HTML::attributes(array_merge([
+                    'rel'  => 'stylesheet',
+                    'href' => $asset['path']
+                ], $asset['attributes']));
+
                 $result .= '<link' . $attributes . '>' . PHP_EOL;
             }
         }
 
         if ($type == null || $type == 'rss'){
             foreach ($this->assets['rss'] as $asset) {
-                $attributes = HTML::attributes(array_merge(
-                    [
-                        'rel' => 'alternate',
-                        'href' => $asset['path'],
-                        'title' => 'RSS',
-                        'type' => 'application/rss+xml'
-                    ],
-                    $asset['attributes'])
-                );
+
+                $attributes = HTML::attributes(array_merge([
+                    'rel'   => 'alternate',
+                    'href'  => $asset['path'],
+                    'title' => 'RSS',
+                    'type'  => 'application/rss+xml'
+                ], $asset['attributes']));
+
                 $result .= '<link' . $attributes . '>' . PHP_EOL;
             }
         }
 
         if ($type == null || $type == 'js') {
             foreach ($this->assets['js'] as $asset) {
-                $attributes = HTML::attributes(array_merge(
-                    [
-                        'src' => $asset['path']
-                    ],
-                    $asset['attributes'])
-                );
+
+                $attributes = HTML::attributes(array_merge([
+                    'src' => $asset['path']
+                ], $asset['attributes']));
+
                 $result .= '<script' . $attributes . '></script>' . PHP_EOL;
             }
         }
@@ -83,7 +80,7 @@ trait AssetMaker
      * Adds JavaScript asset to the asset list. Call $this->makeAssets() in a view 
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the script.
-     * @param array $attributes Adds HTML attributes to the asset link.
+     * @param array $attributes Adds extra HTML attributes to the asset link.
      * @return void
      */
     public function addJs($name, $attributes = [])
@@ -97,17 +94,14 @@ trait AssetMaker
             $jsPath = Request::getBaseUrl() . $jsPath;
 
         if (!in_array($jsPath, $this->assets['js']))
-            $this->assets['js'][] = [
-                'path' => $jsPath,
-                'attributes' => $attributes
-            ];
+            $this->assets['js'][] = ['path' => $jsPath, 'attributes' => $attributes];
     }
 
     /**
      * Adds StyleSheet asset to the asset list. Call $this->makeAssets() in a view
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the script.
-     * @param array $attributes Adds HTML attributes to the asset link.
+     * @param array $attributes Adds extra HTML attributes to the asset link.
      * @return void
      */
     public function addCss($name, $attributes = [])
@@ -121,17 +115,14 @@ trait AssetMaker
             $cssPath = Request::getBaseUrl() . $cssPath;
 
         if (!in_array($cssPath, $this->assets['css']))
-            $this->assets['css'][] = [
-                'path' => $cssPath,
-                'attributes' => $attributes
-            ];
+            $this->assets['css'][] = ['path' => $cssPath, 'attributes' => $attributes];
     }
 
     /**
      * Adds an RSS link asset to the asset list. Call $this->makeAssets() in a view
      * to output corresponding markup.
      * @param string $name Specifies a path (URL) to the RSS channel
-     * @param array $attributes Adds HTML attributes to the asset link.
+     * @param array $attributes Adds extra HTML attributes to the asset link.
      * @return void
      */
     public function addRss($name, $attributes = [])
@@ -145,10 +136,7 @@ trait AssetMaker
             $rssPath = Request::getBaseUrl() . $rssPath;
 
         if (!in_array($rssPath, $this->assets['rss']))
-            $this->assets['rss'][] = [
-                'path' => $rssPath,
-                'attributes' => $attributes
-            ];
+            $this->assets['rss'][] = ['path' => $rssPath, 'attributes' => $attributes];
     }
 
     /**

From 0088804ee984fb19e18520692e75aa19cb8afcf3 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 11:11:29 +1000
Subject: [PATCH 22/24] SQLite doesn't like this key name

---
 .../2014_01_04_000005_Db_Backend_User_Preferences.php           | 2 +-
 .../migrations/2013_10_01_000006_Db_System_Parameters.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/backend/database/migrations/2014_01_04_000005_Db_Backend_User_Preferences.php b/modules/backend/database/migrations/2014_01_04_000005_Db_Backend_User_Preferences.php
index 397bead9b..b1884195c 100644
--- a/modules/backend/database/migrations/2014_01_04_000005_Db_Backend_User_Preferences.php
+++ b/modules/backend/database/migrations/2014_01_04_000005_Db_Backend_User_Preferences.php
@@ -16,7 +16,7 @@ class DbBackendUserPreferences extends Migration
             $table->string('group');
             $table->string('item');
             $table->text('value')->nullable();
-            $table->index(['user_id', 'namespace', 'group', 'item'], 'key_index');
+            $table->index(['user_id', 'namespace', 'group', 'item'], 'user_item_index');
         });
     }
 
diff --git a/modules/system/database/migrations/2013_10_01_000006_Db_System_Parameters.php b/modules/system/database/migrations/2013_10_01_000006_Db_System_Parameters.php
index 48e9a6e49..c0795d275 100644
--- a/modules/system/database/migrations/2013_10_01_000006_Db_System_Parameters.php
+++ b/modules/system/database/migrations/2013_10_01_000006_Db_System_Parameters.php
@@ -15,7 +15,7 @@ class DbSystemParameters extends Migration
             $table->string('group');
             $table->string('item');
             $table->text('value')->nullable();
-            $table->index(['namespace', 'group', 'item'], 'key_index');
+            $table->index(['namespace', 'group', 'item'], 'item_index');
         });
     }
 

From 12a80cae9cab0e9898b5f3de34a76f76294dfaab Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 11:29:44 +1000
Subject: [PATCH 23/24] Add new keys to other languages (needs further
 translation)

---
 modules/backend/lang/de/lang.php | 13 ++++++++++++-
 modules/backend/lang/ru/lang.php | 13 ++++++++++++-
 modules/backend/lang/sv/lang.php | 13 ++++++++++++-
 modules/backend/lang/tr/lang.php | 13 ++++++++++++-
 modules/cms/lang/de/lang.php     | 20 ++++++++++++++++++++
 modules/cms/lang/en/lang.php     |  2 +-
 modules/cms/lang/ru/lang.php     | 20 ++++++++++++++++++++
 modules/cms/lang/sv/lang.php     | 20 ++++++++++++++++++++
 modules/cms/lang/tr/lang.php     | 20 ++++++++++++++++++++
 modules/system/lang/de/lang.php  | 29 +++++++++++++++++++++++++++++
 modules/system/lang/ru/lang.php  | 29 +++++++++++++++++++++++++++++
 modules/system/lang/sv/lang.php  | 29 +++++++++++++++++++++++++++++
 modules/system/lang/tr/lang.php  | 29 +++++++++++++++++++++++++++++
 13 files changed, 245 insertions(+), 5 deletions(-)

diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index e6cb11bd8..f0bf2e628 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -45,6 +45,7 @@ return [
         'name' => 'Administrator',
         'menu_label' => 'Administratoren',
         'list_title' => 'Administratoren verwalten',
+        'new' => 'New Administrator',
         'login' => "Anmelden",
         'first_name' => "Vorname",
         'last_name' => "Nachname",
@@ -59,11 +60,16 @@ return [
         'superuser_comment' => "Bestätigen Sie hier, um dem Nutzer Vollzugriff zu geben",
         'send_invite' => 'Einladung per E-Mail versenden',
         'send_invite_comment' => 'Hier bestätigen, dass eine Einladung per E-Mail erfolgt',
+        'delete_confirm' => 'Do you really want to delete this administrator?',
+        'return' => 'Return to the administrator list',
         'group' => [
             'name' => 'Gruppe',
             'name_field' => 'Name',
             'menu_label' => 'Gruppen',
             'list_title' => 'Gruppen verwalten',
+            'new' => 'New Administrator Group',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
+            'return' => 'Return to the group list',
         ],
         'preferences' => [
             'not_authenticated' => 'Zum Speichern oder Anzeigen dieser Einstellungen liegt kein Nutzerkonto vor'
@@ -90,17 +96,22 @@ return [
         'missing_model' => 'In :class genutztes Formularverhalten (behaviour) hat kein definiertes Model',
         'missing_definition' => "Formverhalten fehlt ein Feld für ':field'.",
         'not_found' => 'Formulareintrag mit der ID :id kann nicht gefunden werden.',
+        'create' => 'Create',
+        'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Speichern',
         'save_and_close' => 'Speichern und schließen',
         'saving' => 'Wird gespeichert...',
+        'delete' => 'Löschen',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Divers',
         'field_off' => 'Aus',
         'field_on' => 'An',
         'apply' => 'Anwenden',
         'cancel' => 'Abbrechen',
         'close' => 'Schließen',
-        'delete' => 'Löschen',
         'ok' => 'OK',
+        'or' => 'or',
         'confirm_tab_close' => 'Wollen Sie den Tab wirklich schließen? Ungespeicherte Änderungen gehen verloren.',
         'behavior_not_ready' => 'Formularverhalten kann nicht initialisiert werden, überprüfen Sie den Aufruf von makeLists() in Ihrem Controller.',
     ],
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index 3c628b851..7c8f2bb73 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -45,6 +45,7 @@ return [
         'name' => 'Администратор',
         'menu_label' => 'Администраторы',
         'list_title' => 'Manage Administrators',
+        'new' => 'New Administrator',
         'login' => "Login",
         'first_name' => "First Name",
         'last_name' => "Last Name",
@@ -59,11 +60,16 @@ return [
         'superuser_comment' => "Check this box to allow this person to access all areas.",
         'send_invite' => 'Send invitation by email',
         'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email',
+        'delete_confirm' => 'Do you really want to delete this administrator?',
+        'return' => 'Return to the administrator list',
         'group' => [
             'name' => 'Group',
             'name_field' => 'Name',
             'menu_label' => 'Groups',
             'list_title' => 'Manage Groups',
+            'new' => 'New Administrator Group',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
+            'return' => 'Return to the group list',
         ],
         'preferences' => [
             'not_authenticated' => 'Невозможно загрузить или сохранить настройки для неавторизованного пользователя.',
@@ -90,17 +96,22 @@ return [
         'missing_model' => 'Form used in :class does not have a model defined.',
         'missing_definition' => "Form behavior does not contain a field for ':field'.",
         'not_found' => 'Form record with an ID of :id could not be found.',
+        'create' => 'Create',
+        'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Сохранить',
         'save_and_close' => 'Сохранить и закрыть',
         'saving' => 'Сохранение...',
+        'delete' => 'Delete',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Misc',
         'field_off' => 'Off',
         'field_on' => 'On',
         'apply' => 'Apply',
         'cancel' => 'Cancel',
         'close' => 'Close',
-        'delete' => 'Delete',
         'ok' => 'OK',
+        'or' => 'or',
         'confirm_tab_close' => 'Закрыть закладку? Несохраненные изменения будут потеряны.',
         'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
     ],
diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index 02a958604..d242b6c75 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -45,6 +45,7 @@ return [
         'name' => 'Administratör',
         'menu_label' => 'Administratörer',
         'list_title' => 'Hantera administratörer',
+        'new' => 'New Administrator',
         'login' => "Logga in",
         'first_name' => "Förnamn",
         'last_name' => "Efternamn",
@@ -59,11 +60,16 @@ return [
         'superuser_comment' => "Markera denna checkbox för att ge denna person tillgång till alla områden",
         'send_invite' => 'Inbjudan är sänd via e-post',
         'send_invite_comment' => 'Markera denna checkbox för att skicka en inbjudan till användaren via e-post',
+        'delete_confirm' => 'Do you really want to delete this administrator?',
+        'return' => 'Return to the administrator list',
         'group' => [
             'name' => 'Grupp',
             'name_field' => 'Namn',
             'menu_label' => 'Grupper',
             'list_title' => 'Hantera grupper',
+            'new' => 'New Administrator Group',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
+            'return' => 'Return to the group list',
         ],
         'preferences' => [
             'not_authenticated' => 'Det finns ingen autentiserad användare att ladda eller spara inställningar för',
@@ -90,17 +96,22 @@ return [
         'missing_model' => 'Formuläregenskapen som används i :class har ingen modell definierad',
         'missing_definition' => "Formuläregenskapen saknar ett fält för ':field'",
         'not_found' => 'Record ID :id för formuläret kunde ej hittas',
+        'create' => 'Create',
+        'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Spara',
         'save_and_close' => 'Spara och stäng',
         'saving' => 'Sparar...',
+        'delete' => 'Radera',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Övrigt',
         'field_off' => 'Av',
         'field_on' => 'På',
         'apply' => 'Spara',
         'cancel' => 'Avbryt',
         'close' => 'Stäng',
-        'delete' => 'Radera',
         'ok' => 'OK',
+        'or' => 'or',
         'confirm_tab_close' => 'Vill du verkligen stänga fliken? Ej sparade ändringar kommer gå förlorade',
         'behavior_not_ready' => 'Formuläregenskap har ej blivit initierad, kontrollera att du anropat initForm() i din controller',
     ],
diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index 5660001a7..abca3ae54 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -45,6 +45,7 @@ return [
         'name' => 'Yönetici',
         'menu_label' => 'Yöneticiler',
         'list_title' => 'Yöneticileri Yönet',
+        'new' => 'New Administrator',
         'login' => "Kullanıcı Adı",
         'first_name' => "Adı",
         'last_name' => "Soyadı",
@@ -59,11 +60,16 @@ return [
         'superuser_comment' => "Kullanıcıya her alanda yetki vermek için burayı işaretleyin.",
         'send_invite' => 'Email ile davet gönder',
         'send_invite_comment' => 'Kullanıcının email adresine davet göndermek için burayı işaretleyin',
+        'delete_confirm' => 'Do you really want to delete this administrator?',
+        'return' => 'Return to the administrator list',
         'group' => [
             'name' => 'Grup',
             'name_field' => 'Adı',
             'menu_label' => 'Gruplar',
             'list_title' => 'Grupları Yönet',
+            'new' => 'New Administrator Group',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
+            'return' => 'Return to the group list',
         ],
         'preferences' => [
             'not_authenticated' => 'There is no an authenticated user to load or save preferences for.'
@@ -90,17 +96,22 @@ return [
         'missing_model' => 'Form behavior used in :class does not have a model defined.',
         'missing_definition' => "Form behavior does not contain a field for ':field'.",
         'not_found' => 'Form record with an ID of :id could not be found.',
+        'create' => 'Create',
+        'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Kaydet',
         'save_and_close' => 'Kaydet ve kapat',
         'saving' => 'Kaydediliyor...',
+        'delete' => 'Sil',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Diğer',
         'field_off' => 'Kapalı',
         'field_on' => 'Açık',
         'apply' => 'Kabul',
         'cancel' => 'İptal',
         'close' => 'Kapat',
-        'delete' => 'Sil',
         'ok' => 'OK',
+        'or' => 'or',
         'confirm_tab_close' => 'Bu sekmeyi kapatmak istediğinize gerçekten emin misiniz? Kaydedilmemiş değişiklikleri kaybedeceksiniz.',
         'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
     ],
diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index c822372dd..9d5f125f9 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Add',
+        'search' => 'Search...'
+    ],
+    'editor' => [
+        'settings' => 'Settings',
+        'title' => 'Title',
+        'new_title' => 'New page title',
+        'url' => 'URL',
+        'filename' => 'File Name',
+        'layout' => 'Layout',
+        'description' => 'Description',
+        'preview' => 'Preview',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Assets",
         'drop_down_add_title' => 'Hinzufügen...',
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 59aab9052..87f0070dc 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -81,7 +81,7 @@ return [
     'editor' => [
         'settings' => 'Settings',
         'title' => 'Title',
-        'new_title' => 'Nieuwe paginatitel',
+        'new_title' => 'New page title',
         'url' => 'URL',
         'filename' => 'File Name',
         'layout' => 'Layout',
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
index 7b33d03bd..a630daa62 100644
--- a/modules/cms/lang/ru/lang.php
+++ b/modules/cms/lang/ru/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Add',
+        'search' => 'Search...'
+    ],
+    'editor' => [
+        'settings' => 'Settings',
+        'title' => 'Title',
+        'new_title' => 'New page title',
+        'url' => 'URL',
+        'filename' => 'File Name',
+        'layout' => 'Layout',
+        'description' => 'Description',
+        'preview' => 'Preview',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Ресурсы",
         'drop_down_add_title' => 'Добавить...',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 65e54823a..a48d38f81 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Add',
+        'search' => 'Search...'
+    ],
+    'editor' => [
+        'settings' => 'Settings',
+        'title' => 'Title',
+        'new_title' => 'New page title',
+        'url' => 'URL',
+        'filename' => 'File Name',
+        'layout' => 'Layout',
+        'description' => 'Description',
+        'preview' => 'Preview',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Assets",
         'drop_down_add_title' => 'Lägg till...',
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index 9a8cdc70b..a0b4eac09 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -74,6 +74,26 @@ return [
     'cms' => [
         'menu_label' => "CMS"
     ],
+    'sidebar' => [
+        'add' => 'Add',
+        'search' => 'Search...'
+    ],
+    'editor' => [
+        'settings' => 'Settings',
+        'title' => 'Title',
+        'new_title' => 'New page title',
+        'url' => 'URL',
+        'filename' => 'File Name',
+        'layout' => 'Layout',
+        'description' => 'Description',
+        'preview' => 'Preview',
+        'meta' => 'Meta',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'Code',
+        'content' => 'Content',
+    ],
     'asset' => [
         'menu_label' => "Dosyalar",
         'drop_down_add_title' => 'Ekle...',
diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php
index b30a5d239..3952f09ab 100644
--- a/modules/system/lang/de/lang.php
+++ b/modules/system/lang/de/lang.php
@@ -25,12 +25,36 @@ return [
     'project' => [
         'name' => 'Projekt',
         'owner_label' => 'Besitzer',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Projekt-ID',
             'help' => 'Wie Sie Ihre Projekt-ID finden',
             'missing' => 'Bitte geben Sie eine Projekt-ID an.',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Projekt wurde erfolgreich getrennt (detached).',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'general' => 'General',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp' => 'SMTP',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail' => 'Sendmail',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'settings' => [
         'menu_label' => 'Einstellungen',
@@ -45,10 +69,15 @@ return [
         'install_success' => 'Das Plugin wurde erfolgreich installiert.',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Software-Aktualisierung',
         'menu_label' => 'Aktualisierungen',
         'check_label' => 'Auf Aktualisierungen überprüfen',
         'retry_label' => 'Erneut versuchen',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Aktueller Build',
         'core_build_old' => 'Aktueller Build :build',
         'core_build_new' => 'Build :build',
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index 8faa9a65a..b5c4758db 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -25,12 +25,36 @@ return [
     'project' => [
         'name' => 'Project',
         'owner_label' => 'Owner',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Project ID',
             'help' => 'How to find your Project ID',
             'missing' => 'Please specify a Project ID to use.',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Project has been detached successfully.',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'general' => 'General',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp' => 'SMTP',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail' => 'Sendmail',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'settings' => [
         'menu_label' => 'Settings',
@@ -45,10 +69,15 @@ return [
         'install_success' => 'The plugin has been installed successfully.',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Software update',
         'menu_label' => 'Updates',
         'check_label' => 'Check for updates',
         'retry_label' => 'Try again',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Current build',
         'core_build_old' => 'Current build :build',
         'core_build_new' => 'Build :build',
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index 2922d222d..9b4754c21 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -25,12 +25,36 @@ return [
     'project' => [
         'name' => 'Projekt',
         'owner_label' => 'Ägare',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Projekt-ID',
             'help' => 'Hur du hittar ditt Projekt-ID',
             'missing' => 'Var god välj ett Projekt-ID',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Projektet har blivit avlänkat',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'general' => 'General',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp' => 'SMTP',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail' => 'Sendmail',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'settings' => [
         'menu_label' => 'Inställningar',
@@ -45,10 +69,15 @@ return [
         'install_success' => 'Pluginet har installerats',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Uppdatera mjukvara',
         'menu_label' => 'Uppdateringar',
         'check_label' => 'Kontrollera uppdateringar',
         'retry_label' => 'Försök igen',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Nuvarande build',
         'core_build_old' => 'Nuvarande build :build',
         'core_build_new' => 'Build :build',
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index 06872d7c5..7bafbe6f0 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -25,12 +25,36 @@ return [
     'project' => [
         'name' => 'Proje',
         'owner_label' => 'Sahibi',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Proje ID',
             'help' => 'Proje ID\'sini nasıl bulurum?',
             'missing' => 'Lütfen kullanılacak Proje ID\'sini belirleyin.',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Project has been detached successfully.',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'general' => 'General',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp' => 'SMTP',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail' => 'Sendmail',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'settings' => [
         'menu_label' => 'Ayarlar',
@@ -45,10 +69,15 @@ return [
         'install_success' => 'The plugin has been installed successfully.',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Yazılım Güncelleme',
         'menu_label' => 'Güncellemeler',
         'check_label' => 'Güncellemeleri kontrol et',
         'retry_label' => 'Tekrar dene',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Mevcut versiyon',
         'core_build_old' => 'Mevcut versiyon :build',
         'core_build_new' => 'Versiyon :build',

From bcf6d1a2bc6534f34a1f3af0b35dd0dd91746263 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 16 May 2014 11:49:08 +1000
Subject: [PATCH 24/24] Add custom SQL for SQLite

---
 modules/backend/widgets/Lists.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 67e4f9974..15984df04 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -274,7 +274,18 @@ class Lists extends WidgetBase
             $alias = Db::getQueryGrammar()->wrap($column->columnName);
             $table =  $this->model->makeRelation($column->relation)->getTable();
             $sqlSelect = $this->parseTableName($column->sqlSelect, $table);
-            $selects[] = Db::raw("group_concat(" . $sqlSelect . " separator ', ') as ". $alias);
+
+            switch (Db::getDefaultConnection()) {
+                default:
+                case 'mysql':
+                    $selects[] = Db::raw("group_concat(" . $sqlSelect . " separator ', ') as ". $alias);
+                    break;
+
+                case 'sqlite':
+                    $selects[] = Db::raw("group_concat(" . $sqlSelect . ", ', ') as ". $alias);
+                    break;
+            }
+
             $joins[] = $column->relation;
             $tables[$column->relation] = $table;
         }