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