diff --git a/app/lang/en/cachet.php b/app/lang/en/cachet.php
index fb8abdb1..fbaa6c47 100644
--- a/app/lang/en/cachet.php
+++ b/app/lang/en/cachet.php
@@ -2,7 +2,7 @@
 
 return [
     // Components
-    'component' => [
+    'components' => [
         'status' => [
             1 => 'Operational',
             2 => 'Performance Issues',
@@ -10,76 +10,38 @@ return [
             4 => 'Major Outage',
         ],
     ],
+
     // Incidents
-    'incident' => [
-        'status' => [
+    'incidents' => [
+        'none'          => 'No incidents reported.',
+        'past'          => 'Past incidents',
+        'previous_week' => 'Previous week',
+        'next_week'     => 'Next week',
+        'none'          => 'Nothing to report',
+        'status'        => [
             1 => 'Investigating',
             2 => 'Identified',
             3 => 'Watching',
             4 => 'Fixed',
         ],
-        'none' => 'Nothing to report',
     ],
+
     // Service Status
     'service' => [
         'good' => 'All systems are functional.',
         'bad'  => 'Some systems are experiencing issues.',
     ],
+
+    'api' => [
+        'regenerate' => 'Regenerate API Key',
+        'revoke'     => 'Revoke API Key',
+    ],
+
     // Other
     'powered_by'      => ':app Status Page is powered by <a href="https://cachethq.io">Cachet</a>.',
     'about_this_site' => 'About this site',
-    'login_message'   => 'Welcome Back!',
-    'login'           => 'Login',
-    'logout'          => 'Logout',
-    'logged_in'       => 'You\'re logged in.',
-    'setup'           => 'Setup Cachet',
-    'no_incidents'    => 'No incidents reported.',
-    'past_incidents'  => 'Past incidents',
-    'previous_week'   => 'Previous week',
-    'next_week'       => 'Next week',
-    // Dashboard
-    'dashboard' => [
-        'dashboard'                => 'Dashboard',
-        'components'               => 'Components',
-        'component-add'            => 'Add Component',
-        'component-groups'         => 'Component Groups',
-        'component-groups-add'     => 'Create Group',
-        'incidents'                => 'Incidents',
-        'incident-add'             => 'Add Incident',
-        'incident-create-template' => 'Create Template',
-        'metrics'                  => 'Metrics',
-        'metrics-add'              => 'Add Metric Point',
-        'status_page'              => 'Status Page',
-        'settings'                 => 'Settings',
-        'team'                     => 'Team Members',
-        'team-add'                 => 'Add Team Member',
-        'notifications'            => 'Notifications',
-        'toggle_navigation'        => 'Toggle Navigation',
-        'search'                   => 'Search...',
-        'user'                     => 'User',
-        'help'                     => 'Help',
-        'logged_incidents'         => '{0} There are no incidents, good work.|You have logged one incident.|You have reported <strong>:count</strong> incidents.',
-        'settings_saved'           => 'Settings saved.',
-        'settings_not_saved'       => 'Settings could not be saved.',
-        'not_found'                => 'Page Not Found',
-        'not_found_title'          => 'That page went missing!',
-        'not_found_message'        => 'Sorry, but the page you are looking for has not been found. Check the URL for errors and try again.',
-        'not_found_link'           => 'Return to homepage',
-    ],
-    // Forms
-    'forms' => [
-        'email'    => 'Email',
-        'password' => 'Password',
-        // Setup Form
-        'setup' => [
-            'service_details'   => 'Service Details',
-            'status_page_setup' => 'Status Page Setup',
-            'site_name'         => 'Site Name',
-            'site_domain'       => 'Site Domain',
-            'show_support'      => 'Show support for Cachet?',
-            'admin_account'     => 'Administrator Account',
-            'admin_username'    => 'Username',
-            'finish_setup'      => 'Complete Setup',
-        ],
-    ],
+    'rss-feed'        => 'RSS Feed',
+    'atom-feed'       => 'Atom Feed',
+    'feed'            => 'Status Feed',
+
 ];
diff --git a/app/lang/en/dashboard.php b/app/lang/en/dashboard.php
new file mode 100644
index 00000000..c1c31aba
--- /dev/null
+++ b/app/lang/en/dashboard.php
@@ -0,0 +1,128 @@
+<?php
+
+return [
+
+    'dashboard' => 'Dashboard',
+
+    // Incidents
+    'incidents' => [
+        'incidents'                => 'Incidents',
+        'logged'                   => '{0} There are no incidents, good work.|You have logged one incident.|You have reported <strong>:count</strong> incidents.',
+        'incident-create-template' => 'Create Template',
+        'add'                      => [
+            'title'   => 'Add an incident',
+            'success' => 'Incident added.',
+            'failure' => 'Something went wrong with the incident.',
+        ],
+        'edit' => [
+            'title'   => 'Edit an incident',
+            'success' => 'Incident updated.',
+            'failure' => 'Something went wrong with the incident.',
+        ],
+
+        // Incident templates
+        'templates' => [
+            'add' => [
+                'title'   => 'Create an incident template',
+                'success' => 'Template created.',
+                'failure' => 'Something went wrong with the incident template.',
+            ],
+        ],
+    ],
+
+    // Components
+    'components' => [
+        'components'         => 'Component|Components',
+        'component_statuses' => 'Component Statuses',
+        'add'                => [
+            'title'   => 'Create a component',
+            'message' => 'You should add a component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a component',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component.',
+        ],
+
+        // Component groups
+        'groups' => [
+            'groups' => 'Component group|Component groups',
+            'add'    => [
+                'title'   => 'Add a component group',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group.',
+            ],
+        ],
+    ],
+
+    // Metrics
+    'metrics' => [
+        'metrics' => 'Metrics',
+        'add'     => [
+            'title'   => 'Create a metric point',
+            'success' => 'Metric point created.',
+            'failure' => 'Something went wrong with the metric point.',
+        ],
+    ],
+
+    // Team
+    'team' => [
+        'team'        => 'Team',
+        'member'      => 'Member',
+        'profile'     => 'Profile',
+        'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
+        'add'         => [
+            'title'   => 'Add a new team member',
+            'success' => 'Team member added.',
+            'failure' => 'Something went wrong with the component.',
+        ],
+        'edit'        => [
+            'title'   => 'Update profile',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong when updating.',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        'settings'  => 'Settings',
+        'app-setup' => [
+            'app-setup' => 'Application Setup',
+        ],
+        'security' => [
+            'security' => 'Security',
+        ],
+        'stylesheet' => [
+            'stylesheet' => 'Stylesheet',
+        ],
+        'theme' => [
+            'theme' => 'Theme',
+        ],
+        'edit' => [
+            'success' => 'Settings saved.',
+            'failure' => 'Settings could not be saved.',
+        ],
+    ],
+
+    // Login
+    'login' => [
+        'login'     => 'Login',
+        'logged_in' => "You're logged in.",
+        'welcome'   => 'Welcome Back!',
+    ],
+
+    // Sidebar footer
+    'help'        => 'Help',
+    'status_page' => 'Status Page',
+    'logout'      => 'Logout',
+
+    // Notifications
+    'notifications'     => [
+        'notifications' => 'Notifications',
+        'awesome'       => 'Awesome.',
+        'whoops'        => 'Whoops.',
+    ],
+
+];
diff --git a/app/lang/en/errors.php b/app/lang/en/errors.php
new file mode 100644
index 00000000..38ab0bfe
--- /dev/null
+++ b/app/lang/en/errors.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'not-found' => [
+        'code'    => '404',
+        'title'   => 'That page went missing!',
+        'message' => 'Sorry, but the page you are looking for has not been found. Check the URL for errors and try again.',
+        'link'    => 'Return to homepage',
+    ]
+];
diff --git a/app/lang/en/forms.php b/app/lang/en/forms.php
new file mode 100644
index 00000000..273af0d7
--- /dev/null
+++ b/app/lang/en/forms.php
@@ -0,0 +1,90 @@
+<?php
+
+return [
+
+    // Setup form fields
+    'setup' => [
+        'email'       => 'Email',
+        'username'    => 'Username',
+        'password'    => 'Password',
+        'site_name'   => 'Site Name',
+        'site_domain' => 'Site Domain',
+    ],
+
+    // Login form fields
+    'login' => [
+        'email'    => 'Email',
+        'password' => 'Password',
+    ],
+
+    // Incidents form fields
+    'incidents' => [
+        'name'         => 'Name',
+        'status'       => 'Status',
+        'message'      => 'Message',
+        'message-help' => 'You may also use Markdown.',
+
+        'templates' => [
+            'name'     => 'Name',
+            'template' => 'Template',
+        ],
+    ],
+
+    // Components form fields
+    'components' => [
+        'name'        => 'Name',
+        'status'      => 'Status',
+        'group'       => 'Group',
+        'description' => 'Description',
+        'link'        => 'Link',
+        'tags'        => 'Tags',
+        'tags-help'   => 'Comma separated.',
+
+        'groups' => [
+            'name' => 'Name',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        /// Application setup
+        'app-setup' => [
+            'site-name'         => 'Site Name',
+            'site-url'          => 'Site URL',
+            'about-this-page'   => 'About this page',
+            'days-of-incidents' => 'How many days of incidents to show?',
+            'banner'            => 'Banner Image',
+            'banner-help'       => "It's recommended that you upload files no bigger than 930px wide .",
+        ],
+        'security' => [
+            'allowed-domains'      => 'Allowed domains',
+            'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
+        ],
+        'stylesheet' => [
+            'custom-css' => 'Custom Stylesheet',
+        ],
+        'theme' => [
+            'background-color' => 'Background Color',
+            'text-color'       => 'Text Color',
+        ],
+    ],
+
+    'user' => [
+        'username'     => 'Username',
+        'email'        => 'Email',
+        'password'     => 'Password',
+        'api-key'      => 'API Key',
+        'api-key-help' => 'Regenerating your API key will revoke all existing applications.',
+    ],
+
+    // Buttons
+    'add'    => 'Add',
+    'save'   => 'Save',
+    'update' => 'Update',
+    'create' => 'Create',
+    'edit'   => 'Edit',
+    'delete' => 'Delete',
+    'submit' => 'Submit',
+    'cancel' => 'Cancel',
+    'remove' => 'Remove'
+];
diff --git a/app/lang/en/setup.php b/app/lang/en/setup.php
new file mode 100644
index 00000000..30fb6071
--- /dev/null
+++ b/app/lang/en/setup.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'setup'             => 'Setup',
+    'title'             => 'Setup Cachet',
+    'service_details'   => 'Service Details',
+    'status_page_setup' => 'Status Page Setup',
+    'show_support'      => 'Show support for Cachet?',
+    'admin_account'     => 'Administrator Account',
+    'complete_setup'    => 'Complete Setup'
+];
diff --git a/app/lang/es-ES/cachet.php b/app/lang/es-ES/cachet.php
deleted file mode 100755
index 0643b134..00000000
--- a/app/lang/es-ES/cachet.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-return [
-    // Components
-    'component' => [
-        'status' => [
-            1 => 'Operacional',
-            2 => 'Problemas de rendimiento',
-            3 => 'Interrupción parcial',
-            4 => 'Interrupción mayor',
-        ],
-    ],
-    // Incidents
-    'incident' => [
-        'status' => [
-            1 => 'Investigando',
-            2 => 'Problemas de rendimiento',
-            3 => 'Interrupción parcial',
-            4 => 'Interrupción mayor',
-        ],
-    ],
-    // Service Status
-    'service' => [
-        'good' => 'Todos los sistemas funcionando.',
-        'bad'  => 'Algunos sistemas están experimentando problemas.',
-    ],
-    // Other
-    'powered_by'   => ':app Está página ha sido creada por <a href="https://cachethq.github.io">Cachet</a>.',
-    'login'        => 'Entrar',
-    'logout'       => 'Salir',
-    'logged_in'    => 'Estás conectado.',
-    'setup'        => 'Configurar Cachet',
-    'no_incidents' => 'Sin incidentes reportados.',
-    'dashboard'    => [
-        'dashboard'                => 'Panel de control',
-        'components'               => 'Componentes',
-        'component-add'            => 'Agregar componente',
-        'incidents'                => 'Incidencias',
-        'incident-add'             => 'Agregar incidencia',
-        'incident-create-template' => 'Crear plantilla',
-        'metrics'                  => 'Métricas',
-        'metrics-add'              => 'Añadir punto de métrica',
-        'status_page'              => 'Página de estado del sistema',
-        'settings'                 => 'Ajustes',
-        'notifications'            => 'Notificaciones',
-        'toggle_navigation'        => 'Alternar Navegación',
-        'search'                   => 'Buscar',
-        'user'                     => 'Usuario',
-    ],
-    // Forms
-    'forms' => [
-        'email'    => 'Correo electrónico',
-        'password' => 'Contraseña',
-        // Setup Form
-        'setup' => [
-            'service_details'   => 'Detalles del servicio',
-            'status_page_setup' => 'Configuración página de estado del sistema',
-            'site_name'         => 'Nombre del sitio',
-            'site_domain'       => 'Dominio del sitio',
-            'show_support'      => 'Mostrar apoyo por Cachet',
-            'admin_account'     => 'Cuenta de administrador',
-            'admin_username'    => 'Usuario de administrador',
-            'finish_setup'      => 'Terminar configuración',
-        ],
-    ],
-];
diff --git a/app/lang/es-ES/pagination.php b/app/lang/es-ES/pagination.php
deleted file mode 100644
index 325916dc..00000000
--- a/app/lang/es-ES/pagination.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Pagination Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used by the paginator library to build
-    | the simple pagination links. You are free to change them to anything
-    | you want to customize your views to better match your application.
-    |
-    */
-
-    'previous' => '&laquo; Anterior',
-    'next'     => 'Siguiente &raquo;',
-
-];
diff --git a/app/lang/es-ES/reminders.php b/app/lang/es-ES/reminders.php
deleted file mode 100644
index e586361a..00000000
--- a/app/lang/es-ES/reminders.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reminder Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are the default lines which match reasons
-    | that are given by the password broker for a password update attempt
-    | has failed, such as for an invalid token or invalid new password.
-    |
-    */
-
-    'password' => 'Las contraseñas deben tener como minimo 6 cracteres y coincidir con la confirmación.',
-    'user'     => 'No podemos encontrar ningún usuario con ese correo electrónico',
-    'token'    => 'El token de restablecimiento de contraseña no es válido.',
-    'sent'     => 'Recordatorio de contraseña enviado!',
-    'reset'    => 'La contraseña ha sido reestablecida!',
-
-];
diff --git a/app/lang/es-ES/validation.php b/app/lang/es-ES/validation.php
deleted file mode 100644
index 49bc1a0c..00000000
--- a/app/lang/es-ES/validation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | El following language lines contain El default error messages used by
-    | El validator class. Some of Else rules have multiple versions such
-    | as El size rules. Feel free to tweak each of Else messages here.
-    |
-    */
-
-    "accepted"             => "El :attribute debe ser aceptado.",
-    "active_url"           => "El :attribute no es un enlace válido.",
-    "after"                => "El :attribute debe ser una fecha después de :date.",
-    "alpha"                => "El :attribute sólo puede contener letras.",
-    "alpha_dash"           => "El :attribute sólo puede contener letras, números y guiones.",
-    "alpha_num"            => "El :attribute sólo puede contener letras y números.",
-    "array"                => "El :attribute debe ser una matriz.",
-    "before"               => "El :attribute debe ser una fecha antes de :date.",
-    "between"              => [
-        "numeric" => "El :attribute debe ser entre :min y :max.",
-        "file"    => "El :attribute debe ser entre :min y :max kilobytes.",
-        "string"  => "El :attribute debe ser entre :min y :max caracteres.",
-        "array"   => "El :attribute debe tener entre :min y :max objetos.",
-    ],
-    "boolean"              => "El campo del :attribute debe ser verdadero o falso.",
-    "confirmed"            => "La confirmación del :attribute no coincide.",
-    "date"                 => "El :attribute no es una fecha válida.",
-    "date_format"          => "El :attribute no cumple el formato :format.",
-    "different"            => "El :attribute and :oElr must be different.",
-    "digits"               => "El :attribute debe tener :digits digitos.",
-    "digits_between"       => "El :attribute must be between :min and :max digits.",
-    "email"                => "El :attribute debe ser una dirección de email válida.",
-    "exists"               => "El :attribute seleccionado es inválido.",
-    "image"                => "El :attribute debe ser una imagen.",
-    "in"                   => "El :attribute seleccionado es inválido.",
-    "integer"              => "El :attribute debe ser un número entero.",
-    "ip"                   => "El :attribute debe ser una dirección IP válida.",
-    "max"                  => [
-        "numeric" => "El :attribute no puede tener más de :max.",
-        "file"    => "El :attribute no puede tener más de :max kilobytes.",
-        "string"  => "El :attribute no puede tener más de :max caracteres.",
-        "array"   => "El :attribute no puede tener más de :max objetos.",
-    ],
-    "mimes"                => "El :attribute debe ser un archivo de tipo: :values.",
-    "min"                  => [
-        "numeric" => "El :attribute debe tener al menos :min.",
-        "file"    => "El :attribute debe tener al menos :min kilobytes.",
-        "string"  => "El :attribute debe tener al menos :min characters.",
-        "array"   => "El :attribute debe tener al menos :min items.",
-    ],
-    "not_in"               => "El :attribute seleccionado es inválido.",
-    "numeric"              => "El :attribute sebe ser un número.",
-    "regex"                => "El formato del :attribute es inválido.",
-    "required"             => "El campo del :attribute es requerido.",
-    "required_if"          => "El campo del :attribute se requiere cuando :oElr es :value.",
-    "required_with"        => "El campo del :attribute se requiere cuando :values es presente.",
-    "required_with_all"    => "El campo del :attribute se requiere cuando :values es presente.",
-    "required_without"     => "El campo del :attribute se requiere cuando :values no es presente.",
-    "required_without_all" => "El campo del :attribute se requiere cuando ningúna :values es presente.",
-    "same"                 => "Los :attribute y :oElr deben coincidir.",
-    "size"                 => [
-        "numeric" => "El :attribute debe ser :size.",
-        "file"    => "El :attribute debe ser :size kilobytes.",
-        "string"  => "El :attribute debe ser :size characters.",
-        "array"   => "El :attribute tebe contener :size objetos.",
-    ],
-    "unique"               => "El :attribute ya ha sido usado.",
-    "url"                  => "El formato :attribute es inválido.",
-    "timezone"             => "El :attribute debe ser una zona válida.",
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using El
-    | convention "attribute.rule" to name El lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | El 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' => [],
-
-];
diff --git a/app/lang/fr/cachet.php b/app/lang/fr/cachet.php
new file mode 100644
index 00000000..dba831c8
--- /dev/null
+++ b/app/lang/fr/cachet.php
@@ -0,0 +1,47 @@
+<?php
+
+return [
+    // Components
+    'components' => [
+        'status' => [
+            1 => 'Opérationel',
+            2 => 'Problèmes de performances',
+            3 => 'Panne partielle',
+            4 => 'Panne majeure',
+        ],
+    ],
+
+    // Incidents
+    'incidents' => [
+        'none'          => 'Aucun incident reporté.',
+        'past'          => 'Incidents précédents',
+        'previous_week' => 'Semaine précédente',
+        'next_week'     => 'Semaine suivante',
+        'none'          => 'Rien à reporter',
+        'status'        => [
+            1 => 'Enquête en cours',
+            2 => 'Identifié',
+            3 => 'Analyse en cours',
+            4 => 'Corrigé',
+        ],
+    ],
+
+    // Service Status
+    'service' => [
+        'good' => 'Tous les systèmes sont fonctionnels.',
+        'bad'  => 'Certains systèmes rencontrent des problèmes.',
+    ],
+
+    'api' => [
+        'regenerate' => 'Regénérer une clé API',
+        'revoke'     => 'Révoquer cette clé API',
+    ],
+
+    // Other
+    'powered_by'      => ':app Status Page est propulsé par <a href="https://cachethq.github.io">Cachet</a>.',
+    'about_this_site' => 'À propos de ce site',
+    'rss-feed'        => 'Flux RSS',
+    'atom-feed'       => 'Flux Atom',
+    'feed'            => 'Flux des statuts',
+
+];
diff --git a/app/lang/fr/dashboard.php b/app/lang/fr/dashboard.php
new file mode 100644
index 00000000..74064660
--- /dev/null
+++ b/app/lang/fr/dashboard.php
@@ -0,0 +1,128 @@
+<?php
+
+return [
+
+    'dashboard' => 'Tableau de bord',
+
+    // Incidents
+    'incidents' => [
+        'incidents'                => 'Incidents',
+        'logged'                   => '{0} Il n\'y a aucun incident, bien joué !|Vous avez reporté un incident.|Vous avez reporté <strong>:count</strong> incidents.',
+        'incident-create-template' => 'Créer un modèle',
+        'add'                      => [
+            'title'   => 'Ajouter un incident',
+            'success' => 'Incident ajouté.',
+            'failure' => 'Il s\'est passé quelque chose avec cet incident.',
+        ],
+        'edit' => [
+            'title'   => 'Éditer un incident',
+            'success' => 'Incident mis-à-jour.',
+            'failure' => 'Il s\'est passé quelque chose avec cet incident.',
+        ],
+
+        // Incident templates
+        'templates' => [
+            'add' => [
+                'title'   => 'Créer un modèle d\'incident',
+                'success' => 'Modèle créé.',
+                'failure' => 'Il s\'est passé quelque chose avec ce modèle d\'incident.',
+            ],
+        ],
+    ],
+
+    // Components
+    'components' => [
+        'components'         => 'Composant|Composants',
+        'component_statuses' => 'Statut des composants',
+        'add'                => [
+            'title'   => 'Créer un composant',
+            'message' => 'Commencez par ajouter un composant.',
+            'success' => 'Composant créé.',
+            'failure' => 'Il s\'est passé quelque chose avec ce composant.',
+        ],
+        'edit' => [
+            'title'   => 'Éditer un composant',
+            'success' => 'Composant mis-à-jour.',
+            'failure' => 'Il s\'est passé quelque chose avec ce composant.',
+        ],
+
+        // Component groups
+        'groups' => [
+            'groups' => 'Groupe de composants|Groupes de composants',
+            'add'    => [
+                'title'   => 'Ajouter un group de composants',
+                'success' => 'Groupe de composants ajouté.',
+                'failure' => 'Il s\'est passé quelque chose avec ce composantgroupe de composants.',
+            ],
+        ],
+    ],
+
+    // Metrics
+    'metrics' => [
+        'metrics' => 'Point de mesure',
+        'add'     => [
+            'title'   => 'Créer un point de mesure',
+            'success' => 'Point de mesure créé.',
+            'failure' => 'Il s\'est passé quelque chose avec ce point de mesure.',
+        ],
+    ],
+
+    // Team
+    'team' => [
+        'team'        => 'Équipe',
+        'member'      => 'Membre',
+        'profile'     => 'Profil',
+        'description' => 'Les membres de l\'équipe pourrons ajouter, modifier &amp; éditer les composants et incidents.',
+        'add'         => [
+            'title'   => 'Ajouter un membre à l\'équipe',
+            'success' => 'Membre ajouté.',
+            'failure' => 'Il s\'est passé quelque chose avec ce membre.',
+        ],
+        'edit'        => [
+            'title'   => 'Mettre à jour le profil',
+            'success' => 'Profil mis-à-jour.',
+            'failure' => 'Il s\'est passé quelque chose en mettant à jour le profil.',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        'settings'   => 'Réglages',
+        'app-setup'  => [
+            'app-setup' => 'Configuration',
+        ],
+        'security' => [
+            'security' => 'Sécurité',
+        ],
+        'stylesheet' => [
+            'stylesheet' => 'Feuille de style',
+        ],
+        'theme' => [
+            'theme' => 'Thème',
+        ],
+        'edit' => [
+            'success' => 'Réglages sauvegardés.',
+            'failure' => 'Les réglages n\'ont pas pu être sauvegardés.',
+        ],
+    ],
+
+    // Login
+    'login' => [
+        'login'     => 'Connexion',
+        'logged_in' => "Vous êtes connecté.",
+        'welcome'   => 'Re-bonjour !',
+    ],
+
+    // Sidebar footer
+    'help'        => 'Aide',
+    'status_page' => 'Statut des services',
+    'logout'      => 'Déconnexion',
+
+    // Notifications
+    'notifications'     => [
+        'notifications' => 'Notifications',
+        'awesome'       => 'Cool.',
+        'whoops'        => 'Oups.',
+    ],
+
+];
diff --git a/app/lang/fr/errors.php b/app/lang/fr/errors.php
new file mode 100644
index 00000000..dbe86279
--- /dev/null
+++ b/app/lang/fr/errors.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'not-found' => [
+        'code'    => '404',
+        'title'   => 'Cette page est manquante !',
+        'message' => 'Désolé, mais la page que vous recherchez est introuvable. Vérifier l\'URL et essayez à nouveau.',
+        'link'    => 'Retour à l\'accueil',
+    ]
+];
diff --git a/app/lang/fr/forms.php b/app/lang/fr/forms.php
new file mode 100644
index 00000000..9a5d27be
--- /dev/null
+++ b/app/lang/fr/forms.php
@@ -0,0 +1,90 @@
+<?php
+
+return [
+
+    // Setup form fields
+    'setup' => [
+        'email'       => 'Adresse email',
+        'username'    => 'Identifiant',
+        'password'    => 'Mot de passe',
+        'site_name'   => 'Nom du site',
+        'site_domain' => 'Domaine du site',
+    ],
+
+    // Login form fields
+    'login' => [
+        'email'    => 'Adresse email',
+        'password' => 'Mot de passe',
+    ],
+
+    // Incidents form fields
+    'incidents' => [
+        'name'         => 'Nom',
+        'status'       => 'Statut',
+        'message'      => 'Message',
+        'message-help' => 'Vous pouvez aussi utiliser du Markdown.',
+
+        'templates' => [
+            'name'     => 'Nom',
+            'template' => 'Modèle',
+        ],
+    ],
+
+    // Components form fields
+    'components' => [
+        'name'        => 'Nom',
+        'status'      => 'Statut',
+        'group'       => 'Groupe',
+        'description' => 'Description',
+        'link'        => 'Lien',
+        'tags'        => 'Tags',
+        'tags-help'   => 'Séparé par une virgule.',
+
+        'groups' => [
+            'name' => 'Nom',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        /// Application setup
+        'app-setup' => [
+            'site-name'         => 'Nom du site',
+            'site-url'          => 'URL du site',
+            'about-this-page'   => 'À propos de cette page',
+            'days-of-incidents' => 'Nombre de jours à afficher ?',
+            'banner'            => 'Bannière',
+            'banner-help'       => "Il est recommandé de télécharger des fichiers de moins de 930 pixels de large.",
+        ],
+        'security' => [
+            'allowed-domains'      => 'Domaines autorisés. <small class="help-block"></small>',
+            'allowed-domains-help' => 'Séparés par une virgule. Les domaines enregistrés ci-dessus seront automatiquement autorisés par défaut.',
+        ],
+        'stylesheet' => [
+            'custom-css' => 'Feuille de style personnalisée',
+        ],
+        'theme' => [
+            'background-color' => 'Couleur d\'arrière plan',
+            'text-color'       => 'Couleur du texte',
+        ],
+    ],
+
+    'user' => [
+        'username'     => 'Identifiant',
+        'email'        => 'Adresse email',
+        'password'     => 'Mot de passe',
+        'api-key'      => 'Clé API',
+        'api-key-help' => 'Regénérer votre clé API révoquera toutes les applications existantes.',
+    ],
+
+    // Buttons
+    'add'    => 'Ajouter',
+    'save'   => 'Sauvegarder',
+    'update' => 'Mettre à jour',
+    'create' => 'Créer',
+    'edit'   => 'Éditer',
+    'delete' => 'Effacer',
+    'submit' => 'Envoyer',
+    'cancel' => 'Annuler',
+    'remove' => 'Supprimer'
+];
diff --git a/app/lang/pt-BR/pagination.php b/app/lang/fr/pagination.php
similarity index 85%
rename from app/lang/pt-BR/pagination.php
rename to app/lang/fr/pagination.php
index 613b015a..9f07a5f9 100644
--- a/app/lang/pt-BR/pagination.php
+++ b/app/lang/fr/pagination.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'previous' => '&laquo; Anterior',
-    'next'     => 'Próxima &raquo;',
+    'previous' => '&laquo; Précédent',
+    'next'     => 'Suivant &raquo;',
 
 ];
diff --git a/app/lang/pt-BR/reminders.php b/app/lang/fr/reminders.php
similarity index 54%
rename from app/lang/pt-BR/reminders.php
rename to app/lang/fr/reminders.php
index 11efd431..0f9ea9e5 100644
--- a/app/lang/pt-BR/reminders.php
+++ b/app/lang/fr/reminders.php
@@ -13,10 +13,10 @@ return [
     |
     */
 
-    'password' => 'A senha deverá conter pelo menos seis carateres e ser igual à confirmação.',
-    'user'     => 'Não conseguimos encontrar nenhum usuário com o endereço de email indicado.',
-    'token'    => 'Este código de recuperação de senha é inválido.',
-    'sent'     => 'O lembrete da senha foi enviado!',
-    'reset'    => 'A senha foi redefinida!',
+    'password' => 'Les mots de passe doivent contenir 6 caractères minimum et être identique à la confirmation.',
+    'user'     => 'Nous ne trouvons aucun utilisateur avec cette adresse email.',
+    'token'    => 'Ce jeton de réinitialisation de mot de passe est invalide.',
+    'sent'     => 'Rappel de mot de passe envoyé !',
+    'reset'    => 'Votre mot de passe à été réinitialisé !',
 
 ];
diff --git a/app/lang/fr/setup.php b/app/lang/fr/setup.php
new file mode 100644
index 00000000..0e555c6b
--- /dev/null
+++ b/app/lang/fr/setup.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'setup'             => 'Installation',
+    'title'             => 'Installer Cachet',
+    'service_details'   => 'Details du service',
+    'status_page_setup' => 'Installation de la page de statut',
+    'show_support'      => 'Montrer votre support pour Cachet ?',
+    'admin_account'     => 'Compte administrateur',
+    'complete_setup'    => 'Terminer l\'installation'
+];
diff --git a/app/lang/fr/validation.php b/app/lang/fr/validation.php
new file mode 100644
index 00000000..7ff1af1d
--- /dev/null
+++ b/app/lang/fr/validation.php
@@ -0,0 +1,104 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    "accepted"             => "Le champ :attribute doit être accepté.",
+    "active_url"           => "Le champ :attribute n'est pas une URL valide.",
+    "after"                => "Le champ :attribute doit être une date postérieure à :date.",
+    "alpha"                => "Le champ :attribute ne peut contenir que des lettres.",
+    "alpha_dash"           => "Le champ :attribute ne peut contenir que des lettres, chiffres et tirets.",
+    "alpha_num"            => "Le champ :attribute ne peut contenir que des lettres ou des chiffres.",
+    "array"                => "Le champ :attribute doit être un tableau.",
+    "before"               => "Le champ :attribute doit être une date antérieure à :date.",
+    "between"              => [
+        "numeric" => "Le champ :attribute doit être entre :min et :max.",
+        "file"    => "Le champ :attribute doit être entre :min et :max kilobytes.",
+        "string"  => "Le champ :attribute doit contenir entre :min et :max caractères.",
+        "array"   => "Le champ :attribute doit avoir entre :min et :max objets.",
+    ],
+    "confirmed"            => "Le champ :attribute confirmation ne correspond pas.",
+    "date"                 => "Le champ :attribute n'est pas une date valide.",
+    "date_format"          => "Le champ :attribute ne correspond pas au format :format.",
+    "different"            => "Le champ :attribute et :other doivent être différents.",
+    "digits"               => "Le champ :attribute doit être composé de :digits chiffres.",
+    "digits_between"       => "Le champ :attribute doit être composé de :min jusqu'à :max chiffres.",
+    "email"                => "Le champ :attribute doit être une adresse email valide.",
+    "exists"               => "Le champ selected :attribute est invalide.",
+    "image"                => "Le champ :attribute doit être une image.",
+    "in"                   => "Le champ selected :attribute est invalide.",
+    "integer"              => "Le champ :attribute doit être un entier.",
+    "ip"                   => "Le champ :attribute doit être une adresse IP valide.",
+    "max"                  => [
+        "numeric" => "Le champ :attribute ne doit pas être supérieure à :max.",
+        "file"    => "Le champ :attribute ne doit pas être supérieure à :max kilobytes.",
+        "string"  => "Le champ :attribute ne doit pas être supérieure à :max caractères.",
+        "array"   => "Le champ :attribute ne doit pas avoir plus de :max objets.",
+    ],
+    "mimes"                => "Le champ :attribute doit être un fichier de type : :values.",
+    "min"                  => [
+        "numeric" => "Le champ :attribute doit être supérieur à :min.",
+        "file"    => "Le champ :attribute  doit être supérieur à :min kilobytes.",
+        "string"  => "Le champ :attribute  doit être supérieur à :min caractères.",
+        "array"   => "Le champ :attribute  doit avoir au moins :min objets.",
+    ],
+    "not_in"               => "Le champ sélectionné :attribute est invalide.",
+    "numeric"              => "Le champ :attribute doit être un nombre.",
+    "regex"                => "Le format du champ :attribute est invalide.",
+    "required"             => "Le champ :attribute est obligatoire.",
+    "required_if"          => "Le champ :attribute est obligatoire quand :other est :value.",
+    "required_with"        => "Le champ :attribute est obligatoire quand :values est présent.",
+    "required_with_all"    => "Le champ :attribute est obligatoire quand :values est présent.",
+    "required_without"     => "Le champ :attribute est obligatoire quand :values n'est pas présent.",
+    "required_without_all" => "Le champ :attribute est obligatoire quand aucun des champs :values n'est présent.",
+    "same"                 => "Le champ :attribute et :other doivent être identiques.",
+    "size"                 => [
+        "numeric" => "La taille du champ :attribute doit être de :size.",
+        "file"    => "Le poids du champ :attribute doit être de :size kilobytes.",
+        "string"  => "Le nombre de caractères du champ :attribute doit être de :size caractères.",
+        "array"   => "Le champ :attribute doit contenir :size objets.",
+    ],
+    "unique"               => "Le champ :attribute est déjà utilisé.",
+    "url"                  => "Le format du champ :attribute est invalide.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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'               => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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'           => [ ],
+
+];
diff --git a/app/lang/it/cachet.php b/app/lang/it/cachet.php
deleted file mode 100755
index 02629ed1..00000000
--- a/app/lang/it/cachet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-return [
-    // Components
-    'component' => [
-        'status' => [
-            1 => 'Operativo',
-            2 => 'Problemi relativi alle Prestazioni',
-            3 => 'Interruzione Parziale',
-            4 => 'Interruzione Principale',
-        ],
-    ],
-    // Incidents
-    'incident' => [
-        'status' => [
-            1 => 'Indagando',
-            2 => 'Problemi relativi alle Prestazioni',
-            3 => 'Interruzione Parziale',
-            4 => 'Interruzione Principale',
-        ],
-    ],
-    // Service Status
-    'service' => [
-        'good' => 'Tutti i sistemi sono funzionanti.',
-        'bad'  => 'Alcuni sistemi stanno riscontrando dei problemi.',
-    ],
-    // Other
-    'powered_by'   => ':app Pagina di Stato creata utilizzando <a href="https://cachethq.github.io">Cachet</a>.',
-    'logout'       => 'Esci',
-    'logged_in'    => 'Sei connesso.',
-    'setup'        => 'Installa Cachet',
-    'no_incidents' => 'Non sono stati segnalati incidenti.',
-    'dashboard'    => [
-        'dashboard'                => 'Dashboard',
-        'components'               => 'Componenti',
-        'component-add'            => 'Aggiungi Componente',
-        'incidents'                => 'Incidenti',
-        'incident-add'             => 'Aggiungi Incidente',
-        'incident-create-template' => 'Crea Modello',
-        'metrics'                  => 'Metriche',
-        'metrics-add'              => 'Aggiungi Punto di Metrica',
-        'status_page'              => 'Pagina di Stato',
-        'settings'                 => 'Impostazioni',
-        'notifications'            => 'Notifiche',
-        'toggle_navigation'        => 'Mostra/Nascondi Navigazione',
-        'search'                   => 'Cerca...',
-        'user'                     => 'Utente',
-    ],
-];
diff --git a/app/lang/pl/cachet.php b/app/lang/pl/cachet.php
deleted file mode 100755
index 1c489305..00000000
--- a/app/lang/pl/cachet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-return [
-    // Components
-    'component' => [
-        'status' => [
-            1 => 'Sprawny',
-            2 => 'Problemy z wydajnością',
-            3 => 'Częściowa awaria',
-            4 => 'Poważna awaria',
-        ],
-    ],
-    // Incidents
-    'incident' => [
-        'status' => [
-            1 => 'Badanie',
-            2 => 'Problemy z wydajnością',
-            3 => 'Częściowa awaria',
-            4 => 'Poważna awaria',
-        ],
-    ],
-    // Service Status
-    'service' => [
-        'good' => 'Wszystkie systemy sprawne.',
-        'bad'  => 'Wykryto problemy w części systemów.',
-    ],
-    // Other
-    'powered_by'   => ':app monitor działa na silniku <a href="https://cachethq.github.io">Cachet</a>.',
-    'logout'       => 'Wyloguj',
-    'logged_in'    => 'Jesteś zalogowany.',
-    'setup'        => 'Skonfiguruj Cachet',
-    'no_incidents' => 'Brak zgłoszonych problemów.',
-    'dashboard'    => [
-        'dashboard'                => 'Pulpit',
-        'components'               => 'Komponenty',
-        'component-add'            => 'Dodaj komponent',
-        'incidents'                => 'Problemy',
-        'incident-add'             => 'Zgłoś problem',
-        'incident-create-template' => 'Stwórz szablon',
-        'metrics'                  => 'Metryki',
-        'metrics-add'              => 'Dodaj metrykę',
-        'status_page'              => 'Strona statusowa',
-        'settings'                 => 'Ustawienia',
-        'notifications'            => 'Powiadomienia',
-        'toggle_navigation'        => 'Schowaj/pokaż nawigację',
-        'search'                   => 'Szukaj...',
-        'user'                     => 'Użytkownik',
-    ],
-];
diff --git a/app/lang/pt-BR/cachet.php b/app/lang/pt-BR/cachet.php
deleted file mode 100644
index 68adf6a3..00000000
--- a/app/lang/pt-BR/cachet.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-return [
-    // Components
-    'component' => [
-        'status' => [
-            1 => 'Operacional',
-            2 => 'Problemas de Perfomance',
-            3 => 'Indisponibilidade Parcial',
-            4 => 'Falha Grave',
-        ],
-    ],
-    // Incidents
-    'incident' => [
-        'status' => [
-            1 => 'Investigando',
-            2 => 'Identificado',
-            3 => 'Monitorando',
-            4 => 'Corrigido',
-        ],
-        'none' => 'Nada a reportar',
-    ],
-    // Service Status
-    'service' => [
-        'good' => 'Todos os sistemas estão funcionais.',
-        'bad'  => 'Alguns sistemas estão passando por problemas.',
-    ],
-    // Other
-    'powered_by'     => ':app Página de status rodando com o <a href="https://cachethq.github.io">Cachet</a>.',
-    'login_message'  => 'Bem vindo novamente!',
-    'login'          => 'Entrar',
-    'logout'         => 'Sair',
-    'logged_in'      => 'Você está logado.',
-    'setup'          => 'Instalação do Cachet',
-    'no_incidents'   => 'Nenhum incidente reportado.',
-    'dashboard'      => [
-        'dashboard'                => 'Painel de Controle',
-        'components'               => 'Componentes',
-        'component-add'            => 'Adicionar Componente',
-        'incidents'                => 'Incidente',
-        'incident-add'             => 'Adicionar Incidente',
-        'incident-create-template' => 'Criar Modelo',
-        'metrics'                  => 'Métricas',
-        'metrics-add'              => 'Adicionar Ponto de métrica',
-        'status_page'              => 'Página de Status',
-        'settings'                 => 'Configurações',
-        'notifications'            => 'Notificações',
-        'toggle_navigation'        => 'Alternar Navegação',
-        'search'                   => 'Buscar...',
-        'user'                     => 'Usuário',
-        'help'                     => 'Ajuda',
-    ],
-    // Forms
-    'forms' => [
-        'email'    => 'Email',
-        'password' => 'Senha',
-        // Setup Form
-        'setup' => [
-            'service_details'   => 'Detalhes do Serviço',
-            'status_page_setup' => 'Instalação da Página de Status',
-            'site_name'         => 'Nome do Site',
-            'site_domain'       => 'Domínio do Site',
-            'show_support'      => 'Mostrar apoio para o Cachet?',
-            'admin_account'     => 'Conta do Administrador',
-            'admin_username'    => 'Nome do Usuário',
-            'finish_setup'      => 'Completar Instalação',
-        ],
-    ],
-];
diff --git a/app/lang/pt-BR/validation.php b/app/lang/pt-BR/validation.php
deleted file mode 100644
index 5fc4bef2..00000000
--- a/app/lang/pt-BR/validation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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"         => "O campo :attribute deve ser aceito.",
-    "active_url"       => "O campo :attribute não contém uma URL válida.",
-    "after"            => "O campo :attribute deverá conter uma data posterior a :date.",
-    "alpha"            => "O campo :attribute deverá conter apenas letras.",
-    "alpha_dash"       => "O campo :attribute deverá conter apenas letras, números e traços.",
-    "alpha_num"        => "O campo :attribute deverá conter apenas letras e números .",
-    "array"            => "O campo :attribute precisa ser um conjunto.",
-    "before"           => "O campo :attribute deverá conter uma data anterior a :date.",
-    "between"          => [
-        "numeric" => "O campo :attribute deverá ter um valor entre :min e :max.",
-        "file"    => "O campo :attribute deverá ter um tamanho entre :min e :max kilobytes.",
-        "string"  => "O campo :attribute deverá conter entre :min e :max caracteres.",
-        "array"   => "O campo :attribute precisar ter entre :min e :max itens.",
-    ],
-    "boolean"          => "O campo :attribute deverá ter o valor verdadeiro ou falso.",
-    "confirmed"        => "A confirmação para o campo :attribute não coincide.",
-    "date"             => "O campo :attribute não contém uma data válida.",
-    "date_format"      => "A data indicada para o campo :attribute não respeita o formato :format.",
-    "different"        => "Os campos :attribute e :other deverão conter valores diferentes.",
-    "digits"           => "O campo :attribute deverá conter :digits caracteres.",
-    "digits_between"   => "O campo :attribute deverá conter entre :min e :max dígitos.",
-    "email"            => "O campo :attribute não contém um endereço de email válido.",
-    "exists"           => "O valor selecionado para o campo :attribute é inválido.",
-    "image"            => "O campo :attribute deverá conter uma imagem.",
-    "in"               => "O campo :attribute não contém um valor válido.",
-    "integer"          => "O campo :attribute deverá conter um número inteiro.",
-    "ip"               => "O campo :attribute deverá conter um IP válido.",
-    "max"              => [
-        "numeric" => "O campo :attribute deverá conter um valor inferior a :max.",
-        "file"    => "O campo :attribute deverá ter um tamanho inferior a :max kilobytes.",
-        "string"  => "O campo :attribute deverá conter menos de :max caracteres.",
-        "array"   => "O campo :attribute deve ter no máximo :max itens.",
-    ],
-    "mimes"            => "O campo :attribute deverá conter um arquivo do tipo: :values.",
-    "min"              => [
-        "numeric" => "O campo :attribute deverá ter um valor superior ou igual a :min.",
-        "file"    => "O campo :attribute deverá ter no mínimo :min kilobytes.",
-        "string"  => "O campo :attribute deverá conter no mínimo :min caracteres.",
-        "array"   => "O campo :attribute deve ter no mínimo :min itens.",
-    ],
-    "not_in"               => "O campo :attribute contém um valor inválido.",
-    "numeric"              => "O campo :attribute deverá conter um valor numérico.",
-    "regex"                => "O formato do valor para o campo :attribute é inválido.",
-    "required"             => "É obrigatória a indicação de um valor para o campo :attribute.",
-    "required_if"          => "É obrigatória a indicação de um valor para o campo :attribute quando o valor do campo :other é igual a :value.",
-    "required_with"        => "É obrigatória a indicação de um valor para o campo :attribute quando :values está presente.",
-    "required_with_all"    => "É obrigatória a indicação de um valor para o campo :attribute quando um dos :values está presente.",
-    "required_without"     => "É obrigatória a indicação de um valor para o campo :attribute quanto :values não está presente.",
-    "required_without_all" => "É obrigatória a indicação de um valor para o campo :attribute quando nenhum dos :values está presente.",
-    "same"                 => "Os campos :attribute e :other deverão conter valores iguais.",
-    "size"                 => [
-        "numeric" => "O campo :attribute deverá conter o valor :size.",
-        "file"    => "O campo :attribute deverá ter o tamanho de :size kilobytes.",
-        "string"  => "O campo :attribute deverá conter :size caracteres.",
-        "array"   => "O campo :attribute deve ter :size itens.",
-    ],
-    "timezone"         => "O campo :attribute deverá ter um fuso horário válido.",
-    "unique"           => "O valor indicado para o campo :attribute já se encontra registrado.",
-    "url"              => "O formato do URL indicado para o campo :attribute é inválido.",
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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' => [],
-
-];
diff --git a/app/lang/sv-SE/cachet.php b/app/lang/sv-SE/cachet.php
deleted file mode 100755
index 741535ee..00000000
--- a/app/lang/sv-SE/cachet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-return [
-    // Components
-    'component' => [
-        'status' => [
-            1 => 'Fungerar',
-            2 => 'Prestandaproblem',
-            3 => 'Delvisa avbrott',
-            4 => 'Större avbrott',
-        ],
-    ],
-    // Incidents
-    'incident' => [
-        'status' => [
-            1 => 'Undersöker',
-            2 => 'Prestandaproblem',
-            3 => 'Delvisa avbrott',
-            4 => 'Större avbrott',
-        ],
-    ],
-    // Service Status
-    'service' => [
-        'good' => 'Alla system fungerar.',
-        'bad'  => 'Vissa system har problem.',
-    ],
-    // Other
-    'powered_by'   => ':app Statussida körs via <a href="https://cachethq.github.io">Cachet</a>.',
-    'logout'       => 'Logga ut',
-    'logged_in'    => 'Du är inloggad.',
-    'setup'        => 'Ställ in Cachet',
-    'no_incidents' => 'Inga händelser har rapporterats.',
-    'dashboard'    => [
-        'dashboard'                => 'Översiktspanel',
-        'components'               => 'Komponenter',
-        'component-add'            => 'Lägg till komponent',
-        'incidents'                => 'Händelser',
-        'incident-add'             => 'Lägg till händelse',
-        'incident-create-template' => 'Skapa mall',
-        'metrics'                  => 'Mått',
-        'metrics-add'              => 'Lägg till mätpunkt',
-        'status_page'              => 'Statussida',
-        'settings'                 => 'Inställningar',
-        'notifications'            => 'Aviseringar',
-        'toggle_navigation'        => 'Växla navigering',
-        'search'                   => 'Sök...',
-        'user'                     => 'Konto',
-    ],
-];
diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php
index bd7e3eb3..e1e4fdbb 100644
--- a/app/views/auth/login.blade.php
+++ b/app/views/auth/login.blade.php
@@ -8,27 +8,27 @@
             </div>
             {{ Form::open() }}
             <fieldset>
-                <legend>{{ trans('cachet.login_message') }}</legend>
+                <legend>{{ trans('dashboard.login.welcome') }}</legend>
 
                 @if(Session::has('error'))
                 <p class='text-danger'>{{ Session::get('error') }}</p>
                 @endif
 
                 <div class='form-group'>
-                    <label class='sr-only'>{{ trans('cachet.forms.email') }}</label>
+                    <label class='sr-only'>{{ trans('forms.login.email') }}</label>
                     {{ Form::email('email', Input::old('email'), [
-                        'class' => 'form-control', 'placeholder' => trans('cachet.forms.email'), 'required' => 'required'
+                        'class' => 'form-control', 'placeholder' => trans('forms.login.email'), 'required' => 'required'
                     ]) }}
                 </div>
                 <div class='form-group'>
-                    <label class='sr-only'>{{ trans('cachet.forms.password') }}</label>
+                    <label class='sr-only'>{{ trans('forms.login.password') }}</label>
                     {{ Form::password('password', [
-                        'class' => 'form-control', 'placeholder' => trans('cachet.forms.password'), 'required' => 'required'
+                        'class' => 'form-control', 'placeholder' => trans('forms.login.password'), 'required' => 'required'
                     ]) }}
                 </div>
                 <hr />
                 <div class='form-group'>
-                    <button type='submit' class='btn btn-lg btn-block btn-success'>{{ trans('cachet.login') }}</button>
+                    <button type='submit' class='btn btn-lg btn-block btn-success'>{{ trans('dashboard.login.login') }}</button>
                 </div>
             </fieldset>
             {{ Form::close() }}
diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php
index 622add57..f7e2a22f 100644
--- a/app/views/dashboard/components/add.blade.php
+++ b/app/views/dashboard/components/add.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
+            <i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.components', 2) }}
         </span>
-        > <small>Create a component</small>
+        > <small>{{ trans('dashboard.components.add.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,9 +16,9 @@
                 @if($component = Session::get('component'))
                 <div class='alert alert-{{ $component->isValid() ? "success" : "danger" }}'>
                     @if($component->isValid())
-                    <strong>Awesome.</strong> Component added.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.add.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong with the component. {{ $component->getErrors() }}
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.add.failure').' '.$component->getErrors()) }}
                     @endif
                 </div>
                 @endif
@@ -26,23 +26,23 @@
                 <form name='CreateComponentForm' class='form-vertical' role='form' action='/dashboard/components/add' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label for='incident-name'>Name</label>
+                            <label for='component-name'>{{ trans('forms.components.name') }}</label>
                             <input type='text' class='form-control' name='component[name]' id='component-name' required />
                         </div>
                         <div class='form-group'>
-                            <label for='component-status'>Status</label>
+                            <label for='component-status'>{{ trans('forms.components.status') }}</label>
                             <select name='component[status]' class='form-control'>
-                                @foreach(trans('cachet.component.status') as $statusID => $status)
+                                @foreach(trans('cachet.components.status') as $statusID => $status)
                                 <option value='{{ $statusID }}'>{{ $status }}</option>
                                 @endforeach
                             </select>
                         </div>
                         <div class='form-group'>
-                            <label>Description</label>
+                            <label>{{ trans('forms.components.description') }}</label>
                             <textarea name='component[description]' class='form-control' rows='5'></textarea>
                         </div>
                         <div class='form-group'>
-                            <label>Group</label>
+                            <label>{{ trans('forms.components.group') }}</label>
                             <select name='component[group_id]' class='form-control'>
                                 <option selected></option>
                                 @foreach($groups as $group)
@@ -52,18 +52,18 @@
                         </div>
                         <hr />
                         <div class='form-group'>
-                            <label>Link</label>
+                            <label>{{ trans('forms.components.link') }}</label>
                             <input type='text' name='component[link]' class='form-control' />
                         </div>
                         <div class='form-group'>
-                            <label>Tags</label>
+                            <label>{{ trans('forms.components.tags') }}</label>
                             <textarea name='component[tags]' class='form-control' rows='2'></textarea>
-                            <span class='help-block'>Comma separated.</span>
+                            <span class='help-block'>{{ trans('forms.components.tags-help') }}</span>
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Submit</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">Cancel</a>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
+                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
                     <input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
                 </form>
             </div>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index b816df59..d9e246d8 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
+            <i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.components', 2) }}
         </span>
-        > <small>Edit component</small>
+        > <small>{{ trans('dashboard.components.edit.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,9 +16,9 @@
                 @if($savedComponent = Session::get('savedComponent'))
                 <div class="alert alert-{{ $savedComponent->isValid() ? "success" : "danger" }}">
                     @if($savedComponent->isValid())
-                    <strong>Awesome.</strong> Component updated.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.edit.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong with the component. {{ $savedComponent->getErrors() }}
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.edit.failure').' '.$component->getErrors()) }}
                     @endif
                 </div>
                 @endif
@@ -26,19 +26,19 @@
                 <form name='EditComponentForm' class='form-vertical' role='form' action='/dashboard/components/{{ $component->id }}/edit' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label for='incident-name'>Name</label>
+                            <label for='incident-name'>{{ trans('forms.components.name') }}</label>
                             <input type='text' class='form-control' name='component[name]' id='component-name' required value='{{ $component->name }}' />
                         </div>
                         <div class='form-group'>
-                            <label for='component-status'>Status</label>
+                            <label for='component-status'>{{ trans('forms.components.status') }}</label>
                             <select name='component[status]' class='form-control'>
-                                @foreach(trans('cachet.component.status') as $statusID => $status)
+                                @foreach(trans('cachet.components.status') as $statusID => $status)
                                 <option value='{{ $statusID }}' {{ $statusID === $component->status ? "selected" : "" }}>{{ $status }}</option>
                                 @endforeach
                             </select>
                         </div>
                         <div class='form-group'>
-                            <label>Description</label>
+                            <label>{{ trans('forms.components.group') }}</label>
                             <textarea name='component[description]' class='form-control' rows='5'>{{ $component->description }}</textarea>
                         </div>
                         <div class='form-group'>
@@ -52,18 +52,18 @@
                         </div>
                         <hr />
                         <div class='form-group'>
-                            <label>Link</label>
+                            <label>{{ trans('forms.components.link') }}</label>
                             <input type='text' name='component[link]' class='form-control' value='{{ $component->link }}' />
                         </div>
                         <div class='form-group'>
-                            <label>Tags</label>
+                            <label>{{ trans('forms.components.tags') }}</label>
                             <textarea name='component[tags]' class='form-control' rows='2'>{{ $component->tags }}</textarea>
-                            <span class='help-block'>Comma separated.</span>
+                            <span class='help-block'>{{ trans('forms.components.tags-help') }}</span>
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Save Component</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">Cancel</a>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
                     <input type='hidden' name='component[user_id]' value='{{ $component->agent_id || Auth::user()->id }}' />
                 </form>
             </div>
diff --git a/app/views/dashboard/components/add-group.blade.php b/app/views/dashboard/components/groups/add.blade.php
similarity index 62%
rename from app/views/dashboard/components/add-group.blade.php
rename to app/views/dashboard/components/groups/add.blade.php
index f09911ee..87b9d433 100644
--- a/app/views/dashboard/components/add-group.blade.php
+++ b/app/views/dashboard/components/groups/add.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
+            <i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
         </span>
-        > <small>Create a component group</small>
+        > <small>{{ trans('dashboard.components.groups.add.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,9 +16,9 @@
                 @if($group = Session::get('group'))
                 <div class='alert alert-{{ $group->isValid() ? "success" : "danger" }}'>
                     @if($group->isValid())
-                    <strong>Awesome.</strong> Component group created.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.groups.add.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong with the group. {{ $group->getErrors() }}
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.groups.add.failure').' '.$group->getErrors()) }}
                     @endif
                 </div>
                 @endif
@@ -26,13 +26,13 @@
                 <form name='CreateComponentGroupForm' class='form-vertical' role='form' action='/dashboard/components/groups/add' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label for='incident-name'>Name</label>
+                            <label for='incident-name'>{{ trans('forms.components.groups.name') }}</label>
                             <input type='text' class='form-control' name='group[name]' id='group-name' required />
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Submit</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.components.groups') }}">Cancel</a>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                    <a class="btn btn-default" href="{{ route('dashboard.components.groups') }}">{{ trans('forms.cancel') }}</a>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/groups.blade.php b/app/views/dashboard/components/groups/index.blade.php
similarity index 77%
rename from app/views/dashboard/groups.blade.php
rename to app/views/dashboard/components/groups/index.blade.php
index 76b5c637..405eb2f1 100644
--- a/app/views/dashboard/groups.blade.php
+++ b/app/views/dashboard/components/groups/index.blade.php
@@ -8,10 +8,10 @@
         <div class="content-wrapper">
             <div class="header sub-header">
                 <span class="uppercase">
-                    <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.component-groups') }}
+                    <i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
                 </span>
                 <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.groups.add') }}">
-                    {{ trans('cachet.dashboard.component-groups-add') }}
+                    {{ trans('dashboard.components.groups.add.title') }}
                 </a>
                 <div class="clearfix"></div>
             </div>
@@ -23,12 +23,12 @@
                             <strong>{{ $group->name }}</strong>
                         </div>
                         <div class='col-md-4 text-right'>
-                            <a href='#' class='btn btn-default'>Edit</a>
-                            <a href='#' class='btn btn-danger'>Delete</a>
+                            <a href='#' class='btn btn-default'>{{ trans('forms.edit') }}</a>
+                            <a href='#' class='btn btn-danger'>{{ trans('forms.delete') }}</a>
                         </div>
                     </div>
                     @empty
-                    <div class='list-group-item text-danger'>You should add a component.</div>
+                    <div class='list-group-item text-danger'>{{ trans('dashboard.components.add.message') }}</div>
                     @endforelse
                 </div>
             </div>
diff --git a/app/views/dashboard/components/index.blade.php b/app/views/dashboard/components/index.blade.php
index 0d5def3f..fe6b9360 100644
--- a/app/views/dashboard/components/index.blade.php
+++ b/app/views/dashboard/components/index.blade.php
@@ -8,10 +8,10 @@
         <div class="content-wrapper">
             <div class="header sub-header">
                 <span class="uppercase">
-                    <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
+                    <i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.components', 2) }}
                 </span>
                 <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}">
-                    {{ trans('cachet.dashboard.component-add') }}
+                    {{ trans('dashboard.components.add.title') }}
                 </a>
                 <div class="clearfix"></div>
             </div>
@@ -32,13 +32,13 @@
                                 @endif
                             </div>
                             <div class='col-md-4 text-right'>
-                                <a href='/dashboard/components/{{ $component->id }}/edit' class='btn btn-default'>Edit</a>
-                                <a href='/dashboard/components/{{ $component->id }}/delete' class='btn btn-danger'>Delete</a>
+                                <a href='/dashboard/components/{{ $component->id }}/edit' class='btn btn-default'>{{ trans('forms.edit') }}</a>
+                                <a href='/dashboard/components/{{ $component->id }}/delete' class='btn btn-danger'>{{ trans('forms.delete') }}</a>
                             </div>
                             <input type='hidden' rel='order' name='component[{{ $component->id }}]' value='{{ $component->order }}' />
                         </div>
                         @empty
-                        <div class='list-group-item text-danger'>You should add a component.</div>
+                        <div class='list-group-item text-danger'>{{ trans('dashboard.components.add.message') }}</div>
                         @endforelse
                     </div>
                 </form>
diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index cc4f4246..d3fbd32c 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }}
+            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
         </span>
-        > <small>Create an Incident</small>
+        > <small>{{ trans('dashboard.incidents.add.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,9 +16,9 @@
                 @if($incident = Session::get('incident'))
                 <div class="alert alert-{{ $incident->isValid() ? "success" : "danger" }}">
                     @if($incident->isValid())
-                    <strong>Awesome.</strong> Incident added.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.add.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong with the incident.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.add.failure').' '.$incident->getErrors()) }}
                     @endif
                 </div>
                 @endif
@@ -26,42 +26,42 @@
                 {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
                     <fieldset>
                         <div class="form-group">
-                            <label for="incident-name">Incident Name</label>
+                            <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
                             <input type="text" class='form-control' name='incident[name]' id='incident-name' required />
                         </div>
                         <div class="form-group">
-                            <label for="incident-name">Incident Status</label><br />
+                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="1">
+                                <input type="radio" name="incident[status]" value="1" />
                                 <i class="icon ion-flag"></i>
-                                {{ trans('cachet.incident.status')[1] }}
+                                {{ trans('cachet.incidents.status')[1] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="2">
+                                <input type="radio" name="incident[status]" value="2" />
                                 <i class="icon ion-alert-circled"></i>
-                                {{ trans('cachet.incident.status')[2] }}
+                                {{ trans('cachet.incidents.status')[2] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="3">
+                                <input type="radio" name="incident[status]" value="3" />
                                 <i class="icon ion-eye"></i>
-                                {{ trans('cachet.incident.status')[3] }}
+                                {{ trans('cachet.incidents.status')[3] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="4">
+                                <input type="radio" name="incident[status]" value="4" />
                                 <i class="icon ion-checkmark"></i>
-                                {{ trans('cachet.incident.status')[4] }}
+                                {{ trans('cachet.incidents.status')[4] }}
                             </label>
                         </div>
                         <div class="form-group">
-                            <label>Message</label>
+                            <label>{{ trans('forms.incidents.message') }}</label>
                             <textarea name="incident[message]" class="form-control" rows="5"></textarea>
-                            <span class='help-block'>You may also use Markdown.</span>
+                            <span class='help-block'>{{ trans('forms.incidents.message-help') }}</span>
                         </div>
                     </fieldset>
 
                     <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}">
-                    <button type="submit" class="btn btn-success">Create</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">Cancel</a>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                    <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php
index 5605e304..2bd51e3d 100644
--- a/app/views/dashboard/incidents/edit.blade.php
+++ b/app/views/dashboard/incidents/edit.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }}
+            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
         </span>
-        > <small>Edit an Incident</small>
+        > <small>{{ trans('dashboard.incidents.edit.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,43 +16,43 @@
                 {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
                 <fieldset>
                     <div class="form-group">
-                        <label for="incident-name">Incident Name</label>
+                        <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
                         <input type="text" class='form-control' name='incident[name]' id='incident-name' required value={{$incident->name}} />
                     </div>
                     <div class="form-group">
-                        <label for="incident-name">Incident Status</label><br />
+                        <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
                         <label class="radio-inline">
                             <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} />
                             <i class="icon ion-flag"></i>
-                            {{ trans('cachet.incident.status')[1] }}
+                            {{ trans('cachet.incidents.status')[1] }}
                         </label>
                         <label class="radio-inline">
                             <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/>
                             <i class="icon ion-alert-circled"></i>
-                            {{ trans('cachet.incident.status')[2] }}
+                            {{ trans('cachet.incidents.status')[2] }}
                         </label>
                         <label class="radio-inline">
                             <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/>
                             <i class="icon ion-eye"></i>
-                            {{ trans('cachet.incident.status')[3] }}
+                            {{ trans('cachet.incidents.status')[3] }}
                         </label>
                         <label class="radio-inline">
                             <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/>
                             <i class="icon ion-checkmark"></i>
-                            {{ trans('cachet.incident.status')[4] }}
+                            {{ trans('cachet.incidents.status')[4] }}
                         </label>
                     </div>
                     <div class="form-group">
-                        <label>Message</label>
-                        <textarea name="incident[message]" class="form-control" rows="5">{{$incident->message}}</textarea>
-                        <span class='help-block'>You may also use Markdown.</span>
+                        <label>{{ trans('forms.incidents.message') }}</label>
+                        <textarea name="incident[message]" class="form-control" rows="5">{{ $incident->message }}</textarea>
+                        <span class='help-block'>{{ trans('forms.incidents.message-help') }}</span>
                     </div>
                 </fieldset>
 
                 <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
                 <input type="hidden" name="incident[id]" value={{$incident->id}} />
-                <button type="submit" class="btn btn-success">Save Incident</button>
-                <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">Cancel</a>
+                <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/index.blade.php b/app/views/dashboard/incidents/index.blade.php
index 0be72462..38add149 100644
--- a/app/views/dashboard/incidents/index.blade.php
+++ b/app/views/dashboard/incidents/index.blade.php
@@ -6,17 +6,17 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incidents') }}
+            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
         </span>
         <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.incidents.add') }}">
-            {{ trans('cachet.dashboard.incident-add') }}
+            {{ trans('dashboard.incidents.add.title') }}
         </a>
         <div class="clearfix"></div>
     </div>
     <div class="content-wrapper header-fixed">
         <div class="row">
             <div class="col-sm-12">
-                <p class='lead'>{{ trans_choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}</p>
+                <p class='lead'>{{ trans_choice('dashboard.incidents.logged', $incidents->count(), ['count' => $incidents->count()]) }}</p>
 
                 <div class="striped-list">
                     @foreach($incidents as $incident)
@@ -28,8 +28,8 @@
                             @endif
                         </div>
                         <div class="col-md-6 text-right">
-                            <a href="/dashboard/incidents/{{ $incident->id }}/edit" class="btn btn-default">Edit</a>
-                            <a href="/dashboard/incidents/{{ $incident->id }}/delete" class="btn btn-danger">Delete</a>
+                            <a href="/dashboard/incidents/{{ $incident->id }}/edit" class="btn btn-default">{{ trans('forms.edit') }}</a>
+                            <a href="/dashboard/incidents/{{ $incident->id }}/delete" class="btn btn-danger">{{ trans('forms.delete') }}</a>
                         </div>
                     </div>
                     @endforeach
diff --git a/app/views/dashboard/incidents/incident-template.blade.php b/app/views/dashboard/incidents/templates/add.blade.php
similarity index 64%
rename from app/views/dashboard/incidents/incident-template.blade.php
rename to app/views/dashboard/incidents/templates/add.blade.php
index 26216adf..be2bf7e1 100644
--- a/app/views/dashboard/incidents/incident-template.blade.php
+++ b/app/views/dashboard/incidents/templates/add.blade.php
@@ -6,9 +6,9 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon ion-plus"></i> {{ trans('cachet.dashboard.incident-add') }}
+            <i class="icon ion-plus"></i> {{ trans('dashboard.incidents.incidents') }}
         </span>
-        > <small>Create an Incident Template</small>
+        > <small>{{ trans('dashboard.incidents.templates.add.title') }}</small>
     </div>
     <div class="content-wrapper">
         <div class="row">
@@ -16,9 +16,9 @@
                 @if($template = Session::get('template'))
                 <div class='alert alert-{{ $template->isValid() ? "success" : "danger" }}'>
                     @if($template->isValid())
-                    <strong>Awesome.</strong> Template added.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.add.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong with the template.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.add.failure').' '.$template->getErrors()) }}
                     @endif
                 </div>
                 @endif
@@ -26,16 +26,16 @@
                 {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-vertical', 'role' => 'form']) }}
                     <fieldset>
                         <div class='form-group'>
-                            <label for='template-name'>Template Name</label>
+                            <label for='template-name'>{{ trans('forms.incidents.templates.name') }}</label>
                             <input type='text' class='form-control' name='template[name]' id='template-name' required />
                         </div>
                         <div class='form-group'>
-                            <label>Template</label>
+                            <label>{{ trans('forms.incidents.templates.template') }}</label>
                             <textarea name='template[template]' class='form-control' rows='5' required></textarea>
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Create</button>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php
index 0730a7e2..e1e118f0 100644
--- a/app/views/dashboard/index.blade.php
+++ b/app/views/dashboard/index.blade.php
@@ -6,24 +6,24 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon ion-speedometer"></i> {{ trans('cachet.dashboard.dashboard') }}
+            <i class="icon ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
         </span>
     </div>
     <div class="content-wrapper">
         <div class="row">
             <div class="col-md-12">
-                <h4 class='sub-header'>Component Statuses</h4>
+                <h4 class='sub-header'>{{ trans('dashboard.components.component_statuses') }}</h4>
                 <div class='panel panel-default'>
                     <div class='list-group'>
                         @forelse($components as $component)
                         <div class='list-group-item'>
-                            {{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => 'Component updated.']) }}
+                            {{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => trans('dashboard.components.edit.success')]) }}
                             <div class='row striped-list-item'>
                                 <div class='col-lg-4 col-sm-12'>
                                     <h4>{{ $component->name }}</h4>
                                 </div>
                                 <div class='col-lg-8 col-sm-12 radio-items'>
-                                    @foreach(trans('cachet.component.status') as $statusID => $status)
+                                    @foreach(trans('cachet.components.status') as $statusID => $status)
                                     <div class='radio-inline'>
                                         <label>
                                             <input type='radio' name='status' value='{{ $statusID }}' {{ $component->status === $statusID ? "checked" : null }} />
@@ -37,7 +37,7 @@
                             {{ Form::close() }}
                         </div>
                         @empty
-                        <div class='list-group-item text-danger'>You should add a component.</div>
+                        <div class='list-group-item text-danger'>{{ trans('dashboard.components.add.message') }}</div>
                         @endforelse
                     </div>
                 </div>
diff --git a/app/views/dashboard/metrics/index.blade.php b/app/views/dashboard/metrics/index.blade.php
index b5effc73..d6f196b0 100644
--- a/app/views/dashboard/metrics/index.blade.php
+++ b/app/views/dashboard/metrics/index.blade.php
@@ -5,11 +5,11 @@
         <div class="sidebar-toggler visible-xs">
             <i class="icon ion-navicon"></i>
         </div>
-        <i class="ion ion-stats-bars"></i> {{ trans('cachet.dashboard.metrics') }}
+        <i class="ion ion-stats-bars"></i> {{ trans('dashboard.metrics.metrics') }}
     </div>
     <div class="row">
         <div class="col-sm-12">
-            <h3>Metrics</h3>
+            <h3>{{ trans('dashboard.metrics.metrics') }}</h3>
             <p class='lead'>Eventually this page will show all of the graphs that make up your metrics.</p>
         </div>
     </div>
diff --git a/app/views/dashboard/notifications/index.blade.php b/app/views/dashboard/notifications/index.blade.php
index 8bf6ab55..ea4f837b 100644
--- a/app/views/dashboard/notifications/index.blade.php
+++ b/app/views/dashboard/notifications/index.blade.php
@@ -5,11 +5,11 @@
         <div class="sidebar-toggler visible-xs">
             <i class="icon ion-navicon"></i>
         </div>
-        <i class="ion ion-email"></i> {{ trans('cachet.dashboard.notifications') }}
+        <i class="ion ion-email"></i> {{ trans('dashboard.notifications.notifications') }}
     </div>
     <div class="row">
         <div class="col-sm-12">
-            <h3>Notifications</h3>
+            <h3>{{ trans('dashboard.notifications.notifications') }}</h3>
         </div>
     </div>
 @stop
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index 0283b152..35f2dc92 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -9,10 +9,10 @@
             <div class="row">
                 <div class="col-sm-12">
                     <form id="settings-form" name='SettingsForm' class='form-vertical' role='form' action='/dashboard/settings' method='POST' enctype="multipart/form-data">
-                        <h4 class="sub-header" id='application-setup'>Application Setup</h4>
+                        <h4 class="sub-header" id='application-setup'>{{ trans('dashboard.settings.app-setup.app-setup') }}</h4>
 
                         @if(($saved = Session::get('saved')))
-                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('dashboard.settings.edit.success') }}</strong></div>
                         @elseif(Session::has('error_message'))
                         <div class='alert alert-danger'><strong>{{ Session::get('error_message') }}</strong></div>
                         @endif
@@ -21,7 +21,7 @@
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>Site Name</label>
+                                        <label>{{ trans('forms.settings.app-setup.site-name') }}</label>
                                         <input type='text' class='form-control' name='app_name' value='{{ Setting::get("app_name") }}' required />
                                     </div>
                                 </div>
@@ -29,7 +29,7 @@
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>Site URL</label>
+                                        <label>{{ trans('forms.settings.app-setup.site-url') }}</label>
                                         <input type='text' class='form-control' name='app_domain' value='{{ Setting::get("app_domain") }}' required />
                                     </div>
                                 </div>
@@ -37,7 +37,7 @@
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>About this page</label>
+                                        <label>{{ trans('forms.settings.app-setup.about-this-page') }}</label>
                                         <textarea name='app_about' class='form-control' rows='4'>{{ Setting::get("app_about") }}</textarea>
                                     </div>
                                 </div>
@@ -45,7 +45,7 @@
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>How many days of incidents to show?</label>
+                                        <label>{{ trans('forms.settings.app-setup.days-of-incidents') }}</label>
                                         <input type='number' min='1' max='100' name='app_incident_days' class='form-control' value='{{ Setting::get("app_incident_days") ?: 7 }}' />
                                     </div>
                                 </div>
@@ -53,16 +53,16 @@
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>Banner Image</label>
+                                        <label>{{ trans('forms.settings.app-setup.banner') }}</label>
                                         @if($banner = Setting::get('app_banner'))
                                         <div id="banner-view" class='well'>
                                             <img src='data:{{ Setting::get("app_banner_type") }};base64,{{ $banner }}' style='max-width: 100%' />
                                             <br /><br />
-                                            <button id="remove-banner" class="btn btn-danger">Remove</button>
+                                            <button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
                                         </div>
                                         @endif
                                         <input type='file' name='app_banner' class='form-control' />
-                                        <span class='help-block'>It's recommended that you upload files no bigger than 930px wide.</span>
+                                        <span class='help-block'>{{ trans('forms.settings.app-setup.banner-help') }}</span>
                                     </div>
                                 </div>
                             </div>
@@ -71,7 +71,7 @@
                         <div class='row'>
                             <div class='col-xs-12'>
                                 <div class='form-group'>
-                                    <button type="submit" class="btn btn-success">Save settings</button>
+                                    <button type="submit" class="btn btn-success">{{ trans('forms.save') }}</button>
                                 </div>
                             </div>
                         </div>
diff --git a/app/views/dashboard/settings/security.blade.php b/app/views/dashboard/settings/security.blade.php
index 80ab0cc8..b63ece27 100644
--- a/app/views/dashboard/settings/security.blade.php
+++ b/app/views/dashboard/settings/security.blade.php
@@ -9,22 +9,22 @@
             <div class="row">
                 <div class="col-sm-12">
                     <form name='SettingsForm' class='form-vertical' role='form' action='/dashboard/settings' method='POST'>
-                        <h4 class="sub-header" id='security'>Security</h4>
+                        <h4 class="sub-header" id='security'>{{ trans('dashboard.settings.security.security') }}</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('dashboard.settings.edit.success') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('dashboard.settings.edit.failure') }}</strong></div>
                         @endif
 
                         <fieldset>
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>Allowed Domains <em>Comma Seperated</em></label>
+                                        <label>{{ trans('forms.settings.security.allowed-domains') }}</label>
                                         <textarea class='form-control' name='allowed_domains' rows='5' placeholder='http://cachet.io, http://cachet.herokuapp.com'>{{ Setting::get('allowed_domains') }}</textarea>
                                         <div class='help-block'>
-                                            The domain set above is automatically allowed by default.
+                                            {{ trans('forms.settings.security.allowed-domains-help') }}
                                         </div>
                                     </div>
                                 </div>
@@ -34,7 +34,7 @@
                         <div class='row'>
                             <div class='col-xs-12'>
                                 <div class='form-group'>
-                                    <button type="submit" class="btn btn-success">Save settings</button>
+                                    <button type="submit" class="btn btn-success">{{ trans('forms.save') }}</button>
                                 </div>
                             </div>
                         </div>
diff --git a/app/views/dashboard/settings/stylesheet.blade.php b/app/views/dashboard/settings/stylesheet.blade.php
index f57480d9..1ac889d8 100644
--- a/app/views/dashboard/settings/stylesheet.blade.php
+++ b/app/views/dashboard/settings/stylesheet.blade.php
@@ -9,19 +9,19 @@
             <div class="row">
                 <div class="col-sm-12">
                     <form name='SettingsForm' class='form-vertical' role='form' action='/dashboard/settings' method='POST'>
-                        <h4 class="sub-header" id='stylesheet'>Stylesheet</h4>
+                        <h4 class="sub-header" id='stylesheet'>{{ trans('dashboard.settings.stylesheet.stylesheet') }}</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('dashboard.settings.edit.success') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('dashboard.settings.edit.failure') }}</strong></div>
                         @endif
 
                         <fieldset>
                             <div class='row'>
                                 <div class='col-xs-12'>
                                     <div class='form-group'>
-                                        <label>Custom Stylesheet</label>
+                                        <label>{{ trans('forms.settings.stylesheet.custom-css') }}</label>
                                         <textarea class='form-control' name='stylesheet' rows='10'>{{ Setting::get('stylesheet') }}</textarea>
                                     </div>
                                 </div>
@@ -31,7 +31,7 @@
                         <div class='row'>
                             <div class='col-xs-12'>
                                 <div class='form-group'>
-                                    <button type="submit" class="btn btn-success">Save settings</button>
+                                    <button type="submit" class="btn btn-success">{{ trans('forms.save') }}</button>
                                 </div>
                             </div>
                         </div>
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php
index 03bade3e..da5f9cec 100644
--- a/app/views/dashboard/settings/theme.blade.php
+++ b/app/views/dashboard/settings/theme.blade.php
@@ -9,25 +9,25 @@
             <div class="row">
                 <div class="col-sm-12">
                     <form name='SettingsForm' class='form-vertical' role='form' action='/dashboard/settings' method='POST'>
-                        <h4 class="sub-header" id='theme'>Theme</h4>
+                        <h4 class="sub-header" id='theme'>{{ trans('dashboard.settings.theme.theme') }}</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('dashboard.settings.edit.success') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('dashboard.settings.edit.failure') }}</strong></div>
                         @endif
 
                         <fieldset>
                             <div class='row'>
                                 <div class='col-xs-6'>
                                     <div class='form-group'>
-                                        <label>Background Color</label>
+                                        <label>{{ trans('forms.settings.theme.background-color') }}</label>
                                         <input type='text' class='form-control color-code' name='style.background_color' value='{{ Setting::get("style_background_color") }}' />
                                     </div>
                                 </div>
                                 <div class='col-xs-6'>
                                     <div class='form-group'>
-                                        <label>Text Color</label>
+                                        <label>{{ trans('forms.settings.theme.text-color') }}</label>
                                         <input type='text' class='form-control color-code' name='style.text_color' value='{{ Setting::get("style_text_color") }}' />
                                     </div>
                                 </div>
@@ -59,7 +59,7 @@
                         <div class='row'>
                             <div class='col-xs-12'>
                                 <div class='form-group'>
-                                    <button type="submit" class="btn btn-success">Save settings</button>
+                                    <button type="submit" class="btn btn-success">{{ trans('forms.save') }}</button>
                                 </div>
                             </div>
                         </div>
diff --git a/app/views/dashboard/team/new.blade.php b/app/views/dashboard/team/add.blade.php
similarity index 69%
rename from app/views/dashboard/team/new.blade.php
rename to app/views/dashboard/team/add.blade.php
index 7d9f5fc1..888590f6 100644
--- a/app/views/dashboard/team/new.blade.php
+++ b/app/views/dashboard/team/add.blade.php
@@ -5,8 +5,8 @@
         <div class="sidebar-toggler visible-xs">
             <i class="icon ion-navicon"></i>
         </div>
-        <span class='uppercase'>
-            <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
+        <span class="uppercase">
+            <i class="icon ion-person"></i> {{ trans('dashboard.team.team') }}
         </span>
     </div>
     <div class='content-wrapper'>
@@ -14,31 +14,31 @@
             <div class="col-sm-12">
                 @if($created = Session::get('created'))
                 <div class='alert alert-success'>
-                    <strong>Awesome.</strong> New user has been created.
+                    {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.team.add.success')) }}
                 </div>
                 @elseif($errors = Session::get('errors'))
                 <div class='alert alert-danger'>
-                    <strong>Whoops.</strong> Something went wrong: {{ $errors }}
+                    {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.team.add.failure')) }}
                 </div>
                 @endif
 
                 <form name='UserForm' class='form-vertical' role='form' action='/dashboard/team/add' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label>Username</label>
+                            <label>{{ trans('forms.user.username') }}</label>
                             <input type='text' class='form-control' name='username' value='{{ Input::old("username") }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Email Address</label>
+                            <label>{{ trans('forms.user.email') }}</label>
                             <input type='email' class='form-control' name='email' value='{{ Input::old("email") }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Password</label>
+                            <label>{{ trans('forms.user.password') }}</label>
                             <input type='password' class='form-control' name='password' value='' />
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Create member</button>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
                 </form>
             </div>
         </div>
diff --git a/app/views/dashboard/team/edit.blade.php b/app/views/dashboard/team/edit.blade.php
index f64c81ad..0d8aa26f 100644
--- a/app/views/dashboard/team/edit.blade.php
+++ b/app/views/dashboard/team/edit.blade.php
@@ -6,7 +6,7 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class='uppercase'>
-            <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
+            <i class="ion ion-person"></i> {{ trans('dashboard.user.user') }}
         </span>
     </div>
     <div class='content-wrapper'>
@@ -15,9 +15,9 @@
                 @if($updated = Session::get('updated'))
                 <div class='alert alert-{{ $updated ? "success" : "danger" }}'>
                     @if($updated)
-                    <strong>Awesome.</strong> Profile updated.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.user.edit.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong when updating.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.user.edit.failure')) }}
                     @endif
                 </div>
                 @endif
@@ -25,22 +25,22 @@
                 <form name='UserForm' class='form-vertical' role='form' action='/dashboard/team/{{ $user->id }}' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label>Username</label>
+                            <label>{{ trans('forms.user.username') }}</label>
                             <input type='text' class='form-control' name='username' value='{{ $user->username }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Email Address</label>
+                            <label>{{ trans('forms.user.email') }}</label>
                             <input type='email' class='form-control' name='email' value='{{ $user->email }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Password</label>
+                            <label>{{ trans('forms.user.password') }}</label>
                             <input type='password' class='form-control' name='password' value='' />
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Update profile</button>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                     @if(Auth::user()->isAdmin)
-                    <a class='btn btn-danger' href='/dashboard/user/{{ $user->id }}/api/regen'>Revoke API Key</a>
+                    <a class='btn btn-danger' href='/dashboard/user/{{ $user->id }}/api/regen'>{{ trans('cachet.api.revoke') }}</a>
                     @endif
                 </form>
             </div>
diff --git a/app/views/dashboard/team/index.blade.php b/app/views/dashboard/team/index.blade.php
index 14196255..7a2a028c 100644
--- a/app/views/dashboard/team/index.blade.php
+++ b/app/views/dashboard/team/index.blade.php
@@ -6,17 +6,17 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.team') }}
+            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.team.team') }}
         </span>
         <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.team.add') }}">
-            {{ trans('cachet.dashboard.team-add') }}
+            {{ trans('dashboard.team.add.title') }}
         </a>
         <div class="clearfix"></div>
     </div>
     <div class="content-wrapper header-fixed">
         <div class="row">
             <div class="col-sm-12">
-                <p class='lead'>Team Members will be able to add, modify &amp; edit components and incidents.</p>
+                <p class='lead'>{{ trans('dashboard.team.description') }}</p>
 
                 <div class='user-grid'>
                     @foreach($teamMembers as $member)
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index 19c33b3f..55ea17ec 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -6,7 +6,7 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class='uppercase'>
-            <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
+            <i class="ion ion-person"></i> {{ trans('dashboard.team.profile') }}
         </span>
     </div>
     <div class='content-wrapper'>
@@ -15,9 +15,9 @@
                 @if($updated = Session::get('updated'))
                 <div class='alert alert-{{ $updated ? "success" : "danger" }}'>
                     @if($updated)
-                    <strong>Awesome.</strong> Profile updated.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.user.edit.success')) }}
                     @else
-                    <strong>Whoops.</strong> Something went wrong when updating.
+                        {{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.user.edit.failure')) }}
                     @endif
                 </div>
                 @endif
@@ -25,27 +25,27 @@
                 <form name='UserForm' class='form-vertical' role='form' action='/dashboard/user' method='POST'>
                     <fieldset>
                         <div class='form-group'>
-                            <label>Username</label>
+                            <label>{{ trans('forms.user.username') }}</label>
                             <input type='text' class='form-control' name='username' value='{{ Auth::user()->username }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Email Address</label>
+                            <label>{{ trans('forms.user.email') }}</label>
                             <input type='email' class='form-control' name='email' value='{{ Auth::user()->email }}' required />
                         </div>
                         <div class='form-group'>
-                            <label>Password</label>
+                            <label>{{ trans('forms.user.password') }}</label>
                             <input type='password' class='form-control' name='password' value='' />
                         </div>
                         <hr />
                         <div class='form-group'>
-                            <label>API Key</label>
+                            <label>{{ trans('forms.user.api-key') }}</label>
                             <input type='text' class='form-control' name='api_key' disabled value='{{ Auth::user()->api_key }}' />
-                            <span class='help-block'>Regenerating your API key will revoke all existing applications.</span>
+                            <span class='help-block'>{{ trans('forms.user.api-key-help') }}</span>
                         </div>
                     </fieldset>
 
-                    <button type="submit" class="btn btn-success">Update profile</button>
-                    <a href='/dashboard/user/{{ Auth::user()->id }}/api/regen' class='btn btn-warning'>Regenerate API Key</a>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                    <a href='/dashboard/user/{{ Auth::user()->id }}/api/regen' class='btn btn-warning'>{{ trans('cachet.api.regenerate') }}</a>
                 </form>
             </div>
         </div>
diff --git a/app/views/errors/404.blade.php b/app/views/errors/404.blade.php
index 7af5ff78..a6799c06 100644
--- a/app/views/errors/404.blade.php
+++ b/app/views/errors/404.blade.php
@@ -5,14 +5,14 @@
         <div>
             <img class="logo" height="65" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
         </div>
-        <h1>404</h1>
-        <h3>{{ trans('cachet.dashboard.not_found') }}</h3>
+        <h1>{{ trans('errors.not-found.code') }}</h1>
+        <h3>{{ trans('errors.not-found.title') }}</h3>
 
         <div class="error-desc">
-            <p>{{ trans('cachet.dashboard.not_found_message') }}</p>
+            <p>{{ trans('errors.not-found.message') }}</p>
             <br/>
             <p>
-                <a href='/' class='btn btn-default btn-lg'>{{ trans('cachet.dashboard.not_found_link') }}</a>
+                <a href='/' class='btn btn-default btn-lg'>{{ trans('errors.not-found.link') }}</a>
             </p>
         </div>
     </div>
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index d63215dc..352a863a 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -25,7 +25,7 @@
         @include('partials.graphs')
     @endif --}}
 
-    <h1>{{ trans('cachet.past_incidents') }}</h1>
+    <h1>{{ trans('cachet.incidents.past') }}</h1>
     @foreach($allIncidents as $incidents)
         @include('partials.incidents', $incidents)
     @endforeach
@@ -35,12 +35,12 @@
         <ul class="pager">
             <li class="previous">
                 <a href="{{ route('status-page') }}?start_date={{ $previousDate }}">
-                    <span aria-hidden="true">&larr;</span> {{ trans('cachet.previous_week') }}
+                    <span aria-hidden="true">&larr;</span> {{ trans('cachet.incidents.previous_week') }}
                 </a>
             </li>
             <li class="next @if( ! $canPageForward) disabled @endif">
                 <a @if($canPageForward) href="{{ route('status-page') }}?start_date={{ $nextDate }}" @endif>
-                    {{ trans('cachet.next_week') }} <span aria-hidden="true">&rarr;</span>
+                    {{ trans('cachet.incidents.next_week') }} <span aria-hidden="true">&rarr;</span>
                 </a>
             </li>
         </ul>
diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php
index 1bc40fc2..9e8a545e 100644
--- a/app/views/partials/dashboard/sidebar.blade.php
+++ b/app/views/partials/dashboard/sidebar.blade.php
@@ -21,20 +21,20 @@
         <div class="quick-add-incident">
             <a class="btn btn-block btn-default uppercase" href="{{ route('dashboard.incidents.add') }}">
                 <i class="icon ion-android-checkmark-circle visible-sm"></i>
-                <span class="hidden-sm">{{ trans('cachet.dashboard.incident-add') }}</span>
+                <span class="hidden-sm">{{ trans('dashboard.incidents.add.title') }}</span>
             </a>
         </div>
         <ul>
             <li {{ set_active('dashboard') }}>
                 <a href="{{ route('dashboard') }}">
                     <i class="icon ion-speedometer"></i>
-                    <span>{{ trans('cachet.dashboard.dashboard') }}</span>
+                    <span>{{ trans('dashboard.dashboard') }}</span>
                 </a>
             </li>
             <li {{ set_active('dashboard/incidents*') }}>
                 <a href="{{ route('dashboard.incidents') }}">
                     <i class="icon ion-android-alert"></i>
-                    <span>{{ trans('cachet.dashboard.incidents') }}</span>
+                    <span>{{ trans('dashboard.incidents.incidents') }}</span>
                 </a>
             </li>
             {{-- <li {{ set_active('dashboard/incidents/templates') }}>
@@ -45,13 +45,13 @@
             <li {{ set_active('dashboard/components*') }}>
                 <a href="{{ route('dashboard.components') }}">
                     <i class="icons ion-ios-keypad"></i>
-                    <span>{{ trans('cachet.dashboard.components') }}</span>
+                    <span>{{ trans_choice('dashboard.components.components', 2) }}</span>
                 </a>
             </li>
             <li {{ set_active('dashboard/team*') }}>
                 <a href="{{ route('dashboard.team') }}">
                     <i class="icons ion-ios-people"></i>
-                    <span>{{ trans('cachet.dashboard.team') }}</span>
+                    <span>{{ trans('dashboard.team.team') }}</span>
                 </a>
             </li>
             {{-- <li {{ set_active('dashboard/metrics') }}>
@@ -68,7 +68,7 @@
                 <a href="{{ route('dashboard.settings.setup') }}">
                     <i class="icon ion-gear-a"></i>
                     <span>
-                        {{ trans('cachet.dashboard.settings') }}
+                        {{ trans('dashboard.settings.settings') }}
                     </span>
                 </a>
             </li>
@@ -79,13 +79,13 @@
             </div>
             <br/>
             <ul>
-                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.dashboard.help') }}">
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.help') }}">
                     <a href="https://cachethq.io" target="_blank"><i class="icon ion-help"></i></a>
                 </li>
-                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.dashboard.status_page') }}">
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.status_page') }}">
                     <a href="{{ route('status-page') }}"><i class="icon ion-monitor"></i></a>
                 </li>
-                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.logout') }}">
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.logout') }}">
                     <a href="{{ route('logout') }}"><i class="icon ion-log-out"></i></a>
                 </li>
             </ul>
diff --git a/app/views/partials/incidents.blade.php b/app/views/partials/incidents.blade.php
index 4dd75e67..d32c8864 100644
--- a/app/views/partials/incidents.blade.php
+++ b/app/views/partials/incidents.blade.php
@@ -28,7 +28,7 @@
         @empty
         <div class='panel panel-message'>
             <div class='panel-body'>
-                <p>{{ trans('cachet.incident.none') }}</p>
+                <p>{{ trans('cachet.incidents.none') }}</p>
             </div>
         </div>
         @endforelse
diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php
index 19b2a1df..948090ec 100644
--- a/app/views/partials/support-link.blade.php
+++ b/app/views/partials/support-link.blade.php
@@ -1,10 +1,10 @@
 @if(Setting::get('show_support'))
 <footer class='footer'>
     <p>{{ trans('cachet.powered_by', array('app' => Setting::get('app_name'))) }}</p>
-    <p><a href='/rss'><i class='ion-social-rss'></i> RSS Feed</a></p>
+    <p><a href='/rss'><i class='ion-social-rss'></i> {{ trans('cachet.rss-feed') }}</a>&nbsp;-&nbsp;<a href='/atom'><i class='ion-social-rss'></i> {{ trans('cachet.atom-feed') }}</a></p>
     @if(Auth::check())
     <p>
-        <a href="{{ route('dashboard') }}">{{ trans('cachet.dashboard.dashboard') }}</a> &ndash; <a href="{{ route('logout') }}">{{ trans('cachet.logout') }}</a>
+        <a href="{{ route('dashboard') }}">{{ trans('dashboard.dashboard') }}</a> &ndash; <a href="{{ route('logout') }}">{{ trans('dashboard.logout') }}</a>
     </p>
     @endif
 </footer>
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php
index 2ec70edb..ee9cfaff 100644
--- a/app/views/setup.blade.php
+++ b/app/views/setup.blade.php
@@ -3,28 +3,28 @@
 @section('content')
     <div class="header">
         <span class="uppercase">
-            <i class='ion-gear-a'></i> {{ trans('cachet.setup') }}
+            <i class='ion-gear-a'></i> {{ trans('setup.title') }}
         </span>
     </div>
     <div class="content-wrapper">
         <div class='row'>
             <div class='col-sm-12'>
                 <div class='panel panel-default'>
-                    <div class='panel-heading'>{{ trans('cachet.forms.setup.service_details') }}</div>
+                    <div class='panel-heading'>{{ trans('setup.service_details') }}</div>
                     <div class='panel-body'>
                         {{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }}
                             <fieldset>
-                                <legend>{{ trans('cachet.forms.setup.status_page_setup') }}</legend>
+                                <legend>{{ trans('setup.status_page_setup') }}</legend>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ trans('cachet.forms.setup.site_name') }}</label>
-                                    <input type='text' name='settings[app_name]' class='form-control' placeholder='{{ trans("cachet.forms.setup.site_name") }}' value='{{ Input::old("settings.app_name", "") }}' required />
+                                    <label class='sr-only'>{{ trans('forms.site_name') }}</label>
+                                    <input type='text' name='settings[app_name]' class='form-control' placeholder='{{ trans("forms.setup.site_name") }}' value='{{ Input::old("settings.app_name", "") }}' required />
                                     @if($errors->has('settings.app_name'))
                                     <span class='text-danger'>{{ $errors->first('settings.app_name') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ trans('cachet.forms.setup.site_domain') }}</label>
-                                    <input type='text' name='settings[app_domain]' class='form-control' placeholder='{{ trans("cachet.forms.setup.site_domain") }}' value='{{ Input::old("settings.app_domain", "") }}' required />
+                                    <label class='sr-only'>{{ trans('forms.site_domain') }}</label>
+                                    <input type='text' name='settings[app_domain]' class='form-control' placeholder='{{ trans("forms.setup.site_domain") }}' value='{{ Input::old("settings.app_domain", "") }}' required />
                                     @if($errors->has('settings.app_domain'))
                                     <span class='text-danger'>{{ $errors->first('settings.app_domain') }}</span>
                                     @endif
@@ -32,30 +32,30 @@
                                 <div class='form-group'>
                                     <label>
                                         <input type='checkbox' name='settings[show_support]' value='1' checked />
-                                        {{ trans("cachet.forms.setup.show_support") }}
+                                        {{ trans("setup.show_support") }}
                                     </label>
                                 </div>
                             </fieldset>
 
                             <fieldset>
-                                <legend>Administrator Account</legend>
+                                <legend>{{ trans("setup.admin_account") }}</legend>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ trans("cachet.forms.setup.admin_username") }}</label>
-                                    <input type='text' name='user[username]' class='form-control' placeholder='{{ trans("cachet.forms.setup.admin_username") }}' value='{{ Input::old("user.username", "") }}' required />
+                                    <label class='sr-only'>{{ trans("forms.username") }}</label>
+                                    <input type='text' name='user[username]' class='form-control' placeholder='{{ trans("forms.setup.username") }}' value='{{ Input::old("user.username", "") }}' required />
                                     @if($errors->has('user.username'))
                                     <span class='text-danger'>{{ $errors->first('user.username') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ trans("cachet.forms.email") }}</label>
-                                    <input type='email' name='user[email]' class='form-control' placeholder='{{ trans("cachet.forms.email") }}' value='{{ Input::old("user.email", "") }}' required />
+                                    <label class='sr-only'>{{ trans("forms.email") }}</label>
+                                    <input type='email' name='user[email]' class='form-control' placeholder='{{ trans("forms.setup.email") }}' value='{{ Input::old("user.email", "") }}' required />
                                     @if($errors->has('user.email'))
                                     <span class='text-danger'>{{ $errors->first('user.email') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ trans("cachet.forms.password") }}</label>
-                                    <input type='password' name='user[password]' class='form-control' placeholder='{{ trans("cachet.forms.password") }}' value='{{ Input::old("user.password", "") }}' required />
+                                    <label class='sr-only'>{{ trans("forms.password") }}</label>
+                                    <input type='password' name='user[password]' class='form-control' placeholder='{{ trans("forms.setup.password") }}' value='{{ Input::old("user.password", "") }}' required />
                                     @if($errors->has('user.password'))
                                     <span class='text-danger'>{{ $errors->first('user.password') }}</span>
                                     @endif
@@ -65,7 +65,7 @@
                             <hr />
                             <div class='form-group'>
                                 <input type='hidden' name='settings[app_incident_days]' value='7' />
-                                <button type='submit' class='btn btn-success'>{{ trans("cachet.forms.setup.finish_setup") }}</button>
+                                <button type='submit' class='btn btn-success'>{{ trans("setup.complete_setup") }}</button>
                             </div>
                         {{ Form::close() }}
                     </div>
diff --git a/src/Http/Controllers/AtomController.php b/src/Http/Controllers/AtomController.php
index fc7c231c..b4685d0e 100644
--- a/src/Http/Controllers/AtomController.php
+++ b/src/Http/Controllers/AtomController.php
@@ -19,7 +19,7 @@ class AtomController extends Controller
     {
         $feed = Feed::make();
         $feed->title = Setting::get('app_name');
-        $feed->description = 'Status Feed';
+        $feed->description = trans('cachet.feed');
         $feed->link = Setting::get('app_domain');
 
         $feed->setDateFormat('datetime');
diff --git a/src/Http/Controllers/DashComponentController.php b/src/Http/Controllers/DashComponentController.php
index 059c55bf..f85f874f 100644
--- a/src/Http/Controllers/DashComponentController.php
+++ b/src/Http/Controllers/DashComponentController.php
@@ -13,24 +13,24 @@ use Illuminate\Support\Facades\View;
 class DashComponentController extends Controller
 {
     protected $subMenu = [];
-    protected $subTitle = 'Components';
 
     public function __construct()
     {
         $this->subMenu = [
             'components' => [
-                'title'  => 'Components',
+                'title'  => trans_choice('dashboard.components.components', 2),
                 'url'    => URL::route('dashboard.components'),
                 'icon'   => 'ion-ios-keypad',
                 'active' => false,
             ],
             'groups' => [
-                'title'  => 'Component Groups',
+                'title'  => trans_choice('dashboard.components.groups.groups', 2),
                 'url'    => URL::route('dashboard.components.groups'),
                 'icon'   => 'ion-folder',
                 'active' => false,
             ],
         ];
+        $this->subTitle = trans_choice('dashboard.components.components', 2);
 
         View::share('subTitle', $this->subTitle);
         View::share('subMenu', $this->subMenu);
@@ -48,7 +48,7 @@ class DashComponentController extends Controller
         $this->subMenu['components']['active'] = true;
 
         return View::make('dashboard.components.index')->with([
-            'pageTitle'  => 'Components - Dashboard',
+            'pageTitle'  => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
             'components' => $components,
             'subMenu'    => $this->subMenu,
         ]);
@@ -63,8 +63,8 @@ class DashComponentController extends Controller
     {
         $this->subMenu['groups']['active'] = true;
 
-        return View::make('dashboard.groups')->with([
-            'pageTitle' => 'Component Groups - Dashboard',
+        return View::make('dashboard.components.groups.index')->with([
+            'pageTitle' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'),
             'groups'    => ComponentGroup::all(),
             'subMenu'   => $this->subMenu,
         ]);
@@ -82,7 +82,7 @@ class DashComponentController extends Controller
         $groups = ComponentGroup::all();
 
         return View::make('dashboard.components.edit')->with([
-            'pageTitle' => 'Editing "'.$component->name.'" Component - Dashboard',
+            'pageTitle' => '"'.$component->name.'" - '.trans('dashboard.components.edit.title').' - '.trans('dashboard.dashboard'),
             'component' => $component,
             'groups'    => $groups,
         ]);
@@ -113,7 +113,7 @@ class DashComponentController extends Controller
         $groups = ComponentGroup::all();
 
         return View::make('dashboard.components.add')->with([
-            'pageTitle' => 'Add Component - Dashboard',
+            'pageTitle' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'),
             'groups'    => $groups,
         ]);
     }
@@ -153,7 +153,7 @@ class DashComponentController extends Controller
     public function showAddComponentGroup()
     {
         return View::make('dashboard.components.add-group')->with([
-            'pageTitle' => 'Create Component Group',
+            'pageTitle' => trans('dashboard.components.groups.add.title').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
diff --git a/src/Http/Controllers/DashIncidentController.php b/src/Http/Controllers/DashIncidentController.php
index 5d0c78a0..a072a278 100644
--- a/src/Http/Controllers/DashIncidentController.php
+++ b/src/Http/Controllers/DashIncidentController.php
@@ -21,7 +21,7 @@ class DashIncidentController extends Controller
         $incidents = Incident::orderBy('created_at', 'desc')->get();
 
         return View::make('dashboard.incidents.index')->with([
-            'pageTitle' => 'Incidents - Dashboard',
+            'pageTitle' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'),
             'incidents' => $incidents,
         ]);
     }
@@ -34,7 +34,7 @@ class DashIncidentController extends Controller
     public function showAddIncident()
     {
         return View::make('dashboard.incidents.add')->with([
-            'pageTitle' => 'Add Incident - Dashboard',
+            'pageTitle' => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
@@ -45,8 +45,8 @@ class DashIncidentController extends Controller
      */
     public function showAddIncidentTemplate()
     {
-        return View::make('dashboard.incidents.incident-template')->with([
-            'pageTitle' => 'Add Incident Template - Dashboard',
+        return View::make('dashboard.incidents.templates.add')->with([
+            'pageTitle' => trans('dashboard.incidents.templates.add.title').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
@@ -100,7 +100,7 @@ class DashIncidentController extends Controller
     public function showEditIncidentAction(Incident $incident)
     {
         return View::make('dashboard.incidents.edit')->with([
-            'pageTitle' => 'Edit Incident - Dashboard',
+            'pageTitle' => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
             'incident'  => $incident,
         ]);
     }
diff --git a/src/Http/Controllers/DashSettingsController.php b/src/Http/Controllers/DashSettingsController.php
index bc1860c0..a07ec7d0 100644
--- a/src/Http/Controllers/DashSettingsController.php
+++ b/src/Http/Controllers/DashSettingsController.php
@@ -18,25 +18,25 @@ class DashSettingsController extends Controller
     {
         $this->subMenu = [
             'setup' => [
-                'title'  => 'Application Setup',
+                'title'  => trans('dashboard.settings.app-setup.app-setup'),
                 'url'    => '/dashboard/settings/setup',
                 'icon'   => 'ion-gear-b',
                 'active' => false,
             ],
             'security' => [
-                'title'  => 'Security',
+                'title'  => trans('dashboard.settings.security.security'),
                 'url'    => '/dashboard/settings/security',
                 'icon'   => 'ion-lock-combination',
                 'active' => false,
             ],
             'theme' => [
-                'title'  => 'Theme',
+                'title'  => trans('dashboard.settings.theme.theme'),
                 'url'    => '/dashboard/settings/theme',
                 'icon'   => 'ion-paintbrush',
                 'active' => false,
             ],
             'stylesheet' => [
-                'title'  => 'Stylesheet',
+                'title'  => trans('dashboard.settings.stylesheet.stylesheet'),
                 'url'    => '/dashboard/settings/stylesheet',
                 'icon'   => 'ion-paintbucket',
                 'active' => false,
diff --git a/src/Http/Controllers/DashUserController.php b/src/Http/Controllers/DashUserController.php
index d664e296..9692de04 100644
--- a/src/Http/Controllers/DashUserController.php
+++ b/src/Http/Controllers/DashUserController.php
@@ -19,7 +19,7 @@ class DashUserController extends Controller
     public function showUser()
     {
         return View::make('dashboard.user.index')->with([
-            'pageTitle' => 'User - Dashboard',
+            'pageTitle' => trans('dashboard.team.profile').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
diff --git a/src/Http/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php
index 338ab88a..78b2a9d0 100644
--- a/src/Http/Controllers/DashboardController.php
+++ b/src/Http/Controllers/DashboardController.php
@@ -36,7 +36,7 @@ class DashboardController extends Controller
         $team = User::all();
 
         return View::make('dashboard.team.index')->with([
-            'pageTitle'   => 'Team Members - Dashboard',
+            'pageTitle'   => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
             'teamMembers' => $team,
         ]);
     }
@@ -49,7 +49,7 @@ class DashboardController extends Controller
     public function showTeamMemberView(User $user)
     {
         return View::make('dashboard.team.edit')->with([
-            'pageTitle' => 'Edit User - Dashboard',
+            'pageTitle' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'),
             'user'      => $user,
         ]);
     }
@@ -61,8 +61,8 @@ class DashboardController extends Controller
      */
     public function showAddTeamMemberView()
     {
-        return View::make('dashboard.team.new')->with([
-            'pageTitle' => 'Add User - Dashboard',
+        return View::make('dashboard.team.add')->with([
+            'pageTitle' => trans('dashboard.team.add.title').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
@@ -108,7 +108,7 @@ class DashboardController extends Controller
     public function showMetrics()
     {
         return View::make('dashboard.metrics.index')->with([
-            'pageTitle' => 'Metrics - Dashboard',
+            'pageTitle' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
         ]);
     }
 
@@ -120,7 +120,7 @@ class DashboardController extends Controller
     public function showNotifications()
     {
         return View::make('dashboard.notifications.index')->with([
-            'pageTitle' => 'Notifications - Dashboard',
+            'pageTitle' => trans('dashboard.notifications.notifications').' - '.trans('dashboard.dashboard'),
         ]);
     }
 }
diff --git a/src/Http/Controllers/RssController.php b/src/Http/Controllers/RssController.php
index 652651c5..b819e1a8 100644
--- a/src/Http/Controllers/RssController.php
+++ b/src/Http/Controllers/RssController.php
@@ -20,7 +20,7 @@ class RssController extends Controller
         $feed = RssFacade::feed('2.0', 'UTF-8');
         $feed->channel([
             'title'       => Setting::get('app_name'),
-            'description' => 'Status Feed',
+            'description' => trans('cachet.feed'),
             'link'        => Setting::get('app_domain'),
         ]);
 
diff --git a/src/Http/Controllers/SetupController.php b/src/Http/Controllers/SetupController.php
index 93d3106e..c82cd673 100644
--- a/src/Http/Controllers/SetupController.php
+++ b/src/Http/Controllers/SetupController.php
@@ -31,7 +31,7 @@ class SetupController extends Controller
     public function getIndex()
     {
         return View::make('setup')->with([
-            'pageTitle' => 'Setup',
+            'pageTitle' => trans('setup.setup'),
         ]);
     }
 
diff --git a/src/Models/Component.php b/src/Models/Component.php
index 816eb048..2c2ba8ed 100644
--- a/src/Models/Component.php
+++ b/src/Models/Component.php
@@ -108,7 +108,7 @@ class Component extends Model implements TransformableInterface
      */
     public function getHumanStatusAttribute()
     {
-        return trans('cachet.component.status.'.$this->status);
+        return trans('cachet.components.status.'.$this->status);
     }
 
     /**
diff --git a/src/Models/Incident.php b/src/Models/Incident.php
index 30721555..4838d2b7 100644
--- a/src/Models/Incident.php
+++ b/src/Models/Incident.php
@@ -69,7 +69,7 @@ class Incident extends Model implements TransformableInterface
      */
     public function getHumanStatusAttribute()
     {
-        $statuses = trans('cachet.incident.status');
+        $statuses = trans('cachet.incidents.status');
 
         return $statuses[$this->status];
     }