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 1/3] 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 ddcc63ef6cf529e7c5e03b65dc95175e79a47769 Mon Sep 17 00:00:00 2001
From: Jasper <me@jspr.cc>
Date: Thu, 15 May 2014 22:23:29 +0200
Subject: [PATCH 2/3] 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 8d82727310e76389dd873eea9a73b3e49d761dad Mon Sep 17 00:00:00 2001
From: Jasper <me@jspr.cc>
Date: Fri, 16 May 2014 01:04:40 +0200
Subject: [PATCH 3/3] 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