Merge remote-tracking branch 'origin/develop'

Conflicts:
	CONTRIBUTING.md

.gitignore

@@ -16,4 +16,5 @@ public/uploads/avatars/*
 /app/storage/logs/*
 /app/storage/debugbar/
 /bin/
-.idea
+.idea
+crowdin.yaml

CONTRIBUTING.md

@@ -8,18 +8,12 @@ If you don't have a feature in mind, but would like to contribute back to the pr
 
 -----
 
+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
+
+
+
 ## Translations!
 
-If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
-
-To do so:
-
-* fork the develop branch
-* create a new branch on your new fork (something like `translations/french`)
-* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
-* translate the strings
-* submit a pull request!
-
-**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.
 
 Thanks!

README.md

@@ -3,6 +3,8 @@
 
 ## Snipe-IT - Asset Management For the Rest of Us
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.
 
 It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
@@ -63,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	php artisan migrate
 
 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

app/controllers/admin/AssetsController.php

@@ -212,6 +212,15 @@ class AssetsController extends AdminController
 
             // Was the asset created?
             if($asset->save()) {
+
+				$logaction = new Actionlog();
+				$logaction->asset_id = $asset->id;
+				$logaction->checkedout_to = $asset->assigned_to;
+				$logaction->asset_type = 'hardware';
+				$logaction->user_id = Sentry::getUser()->id;
+				$logaction->note = e(Input::get('note'));
+				$log = $logaction->logaction('checkout');
+
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }

app/controllers/admin/LicensesController.php

@@ -371,13 +371,15 @@ class LicensesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+
 
         // Left join to get a list of assets and some other helpful info
         $asset = DB::table('assets')
             ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-            ->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
+            ->leftJoin('models', 'assets.model_id', '=', 'models.id')
+            ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag',
+            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
             ->whereNull('assets.deleted_at')
             ->get();
 
@@ -388,9 +390,9 @@ class LicensesController extends AdminController
             for ($x=0; $x<count($asset_array); $x++) {
 
                 if ($asset_array[$x]['full_name']!='') {
-                    $full_name = ' ('.$asset_array[$x]['full_name'].')';
+                    $full_name = ' ('.$asset_array[$x]['full_name'].') '.$asset_array[$x]['modelname'];
                 } else {
-                    $full_name = ' (Unassigned)';
+                    $full_name = ' (Unassigned) '.$asset_array[$x]['modelname'];
                 }
                 $asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
 
@@ -457,7 +459,7 @@ class LicensesController extends AdminController
             // Redirect to the asset management page with error
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
         }
-    
+
     if ( e(Input::get('asset_id')) == '') {
             $licenseseat->asset_id = NULL;
         } else {
@@ -599,7 +601,7 @@ class LicensesController extends AdminController
 
           // Show the page
         $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-
+		$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
         //clone the orig
         $license = clone $license_to_clone;
         $license->id = null;
@@ -608,7 +610,7 @@ class LicensesController extends AdminController
         // Show the page
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license);
+        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);
 
     }
 }

app/lang/ar/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/cs/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/da/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Købsdato',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Udløbsdato',
+    'maintained'        => 'Maintained',
     'name'              => 'Software navn',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Noter',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serienummer',
     'supplier'          => 'Leverandør',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Opdater licens',

app/lang/de/admin/licenses/form.php

@@ -9,8 +9,9 @@ return array(
     'date'              => 'Kaufdatum',
     'depreciation'      => 'Abschreibung',
     'expiration'        => 'Ablaufdatum',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
-    'no_depreciation'   => 'Do Not Depreciate',
+    'no_depreciation'   => 'Nicht abschreiben',
     'notes'             => 'Notizen',
     'order'             => 'Bestellnr.',
     'purchase_order'    => 'Bestellnummer',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Anzahl Aktivierungen',
     'serial'            => 'Seriennummer',
     'supplier'          => 'Lieferant',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'E-Mail des Lizenzerwerbers',
     'to_name'           => 'Name des Lizenzerwerbers',
     'update'            => 'Lizenz aktualisieren',

app/lang/de/admin/statuslabels/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Standort nicht verfügbar.',
+    'assoc_users'	 => 'Dieser Ort ist mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer updaten, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Ort wurde nicht erstellt, bitte versuchen Sie es erneut.',
+        'success' => 'Ort erfolgreich erstellt.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Ort wurde nicht aktualisiert, bitte erneut versuchen',
+        'success' => 'Ort erfolgreich aktualisiert.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Bist du sicher, dass du diesen Status entfernen möchtest?',
+        'error'   => 'Es gab einen Fehler beim Löschen des Orts. Bitte versuchen Sie es erneut.',
+        'success' => 'Der Ort wurde erfolgreich gelöscht.'
     )
 
 );

app/lang/de/admin/statuslabels/table.php

@@ -1,10 +1,10 @@
 <?php
 
 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
+    'name'      	=> 'Statusname',
+    'title'      	=> 'Statusbezeichnungen',
+    'update'      	=> 'Statusbezeichnung bearbeiten',
+    'create'      	=> 'Statusbezeichnung erstellen',
+    'about'      	=> 'Info Statusbezeichnung',
     'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
 );

app/lang/de/admin/suppliers/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Supplier does not exist.',
-    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+    'does_not_exist' => 'Lieferant ist nicht vorhanden.',
+    'assoc_users'	 => 'Diese Lieferant ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diesen Lieferant zu verweisen und versuchen Sie es erneut. ',
 
     'create' => array(
-        'error'   => 'Supplier was not created, please try again.',
-        'success' => 'Supplier created successfully.'
+        'error'   => 'Lieferant wurde nicht erstellt, bitte versuchen Sie es erneut.',
+        'success' => 'Lieferant wurde erfolgreich erstellt.'
     ),
 
     'update' => array(
-        'error'   => 'Supplier was not updated, please try again',
-        'success' => 'Supplier updated successfully.'
+        'error'   => 'Lieferant wurde nicht bearbeitet, bitte versuchen Sie es erneut',
+        'success' => 'Lieferant wurde erfolgreich bearbeitet.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this supplier?',
-        'error'   => 'There was an issue deleting the supplier. Please try again.',
-        'success' => 'Supplier was deleted successfully.'
+        'confirm'   => 'Sind Sie sicher, dass Sie diesen Lieferanten löschen möchten?',
+        'error'   => 'Beim löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+        'success' => 'Lieferant wurde erfolgreich gelöscht.'
     )
 
 );

app/lang/de/admin/suppliers/table.php

@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'address'               => 'Supplier Address',
+    'address'               => 'Lieferantenadressen',
     'assets'                => 'Assets',
-    'city'                  => 'City',
+    'city'                  => 'Stadt',
     'contact'               => 'Contact Name',
-    'country'               => 'Country',
-    'create'                => 'Create Supplier',
+    'country'               => 'Land',
+    'create'                => 'Lieferanten erstellen',
     'email'                 => 'Email',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
-    'licenses'              => 'Licenses',
-    'name'                  => 'Supplier Name',
-    'notes'                 => 'Notes',
-    'phone'                 => 'Phone',
-    'state'                 => 'State',
-    'suppliers'             => 'Suppliers',
-    'update'                => 'Update Supplier',
+    'licenses'              => 'Lizenzen',
+    'name'                  => 'Lieferantenname',
+    'notes'                 => 'Notizen',
+    'phone'                 => 'Telefonnummer',
+    'state'                 => 'Bundesland',
+    'suppliers'             => 'Lieferanten',
+    'update'                => 'Lieferanten bearbeiten',
     'url'                   => 'URL',
-    'view'                  => 'View Supplier',
-    'view_assets_for'       => 'View Assets for',
-    'zip'                   => 'Postal Code',
+    'view'                  => 'Lieferanten ansehen',
+    'view_assets_for'       => 'Assets anschauen von',
+    'zip'                   => 'Postleitzahl',
 
 );

app/lang/de/admin/users/general.php

@@ -3,12 +3,12 @@
 
 return array(
 
-    'assets_user'  		=> 'Assets assigned to :name',
-    'clone'  			=> 'Clone User',
-    'contact_user'  	=> 'Contact :name',
-    'edit'  			=> 'Edit User',
-    'history_user'  	=> 'History for :name',
-    'last_login'  		=> 'Last Login',
-    'software_user'  	=> 'Software Checked out to :name',
-    'view_user'  		=> 'View User :name',
+    'assets_user'  		=> 'Assets zugewiesen an :name',
+    'clone'  			=> 'Benutzer kopieren',
+    'contact_user'  	=> 'Kontakt :name',
+    'edit'  			=> 'Benutzer bearbeiten',
+    'history_user'  	=> 'Historie von :name',
+    'last_login'  		=> 'Letzte Anmeldung',
+    'software_user'  	=> 'Software herausgegeben an :name',
+    'view_user'  		=> 'Benutze :name ansehen',
     );

app/lang/de/admin/users/message.php

@@ -2,29 +2,29 @@
 
 return array(
 
-    'user_exists'              	=> 'User already exists!',
-    'user_not_found'           	=> 'User [:id] does not exist.',
-    'user_login_required'      	=> 'The login field is required',
-    'user_password_required'   	=> 'The password is required.',
-    'insufficient_permissions' 	=> 'Insufficient Permissions.',
-    'user_deleted_warning' 		=> 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'user_exists'              	=> 'Benutzer existiert bereits!',
+    'user_not_found'           	=> 'Benutzer [:id] existiert nicht.',
+    'user_login_required'      	=> 'Das Loginfeld ist erforderlich',
+    'user_password_required'   	=> 'Das Passswortfeld ist erforderlich.',
+    'insufficient_permissions' 	=> 'Unzureichende Berechtigungen.',
+    'user_deleted_warning' 		=> 'Dieser Benutzer wurde gelöscht. Sie müssen ihn wiederherstellen, um ihn zu bearbeiten oder neue Assets zuzuweisen.',
 
 
     'success' => array(
-        'create'    => 'User was successfully created.',
-        'update'    => 'User was successfully updated.',
-        'delete'    => 'User was successfully deleted.',
-        'ban'       => 'User was successfully banned.',
-        'unban'     => 'User was successfully unbanned.',
+        'create'    => 'Benutzer wurde erfolgreich erstellt.',
+        'update'    => 'Benutzer wurde erfolgreich bearbeitet.',
+        'delete'    => 'Benutzer wurde erfolgreich gelöscht.',
+        'ban'       => 'Benutzer wurde erfolgreich ausgeschlossen.',
+        'unban'     => 'Benutzer wurde erfolgreich wieder eingeschlossen.',
         'suspend'   => 'User was successfully suspended.',
         'unsuspend' => 'User was successfully unsuspended.',
-        'restored'  => 'User was successfully restored.'
+        'restored'  => 'Benutzer wurde erfolgreich wiederhergestellt.'
     ),
 
     'error' => array(
-        'create' => 'There was an issue creating the user. Please try again.',
-        'update' => 'There was an issue updating the user. Please try again.',
-        'delete' => 'There was an issue deleting the user. Please try again.',
+        'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
+        'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
+        'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
         'unsuspend' => 'There was an issue unsuspending the user. Please try again.'
     ),
 

app/lang/de/admin/users/table.php

@@ -3,30 +3,30 @@
 return array(
 
     'activated'  			=> 'Active',
-    'allow'  				=> 'Allow',
+    'allow'  				=> 'Erlauben',
     'checkedout'  			=> 'Assets',
-    'created_at' 			=> 'Created',
-    'createuser' 			=> 'Create User',
-    'deny'  				=> 'Deny',
+    'created_at' 			=> 'Erstellt',
+    'createuser' 			=> 'Benutzer erstellen',
+    'deny'  				=> 'Ablehnen',
     'email'      			=> 'Email',
     'employee_num'      	=> 'Employee No.',
-    'first_name' 			=> 'First Name',
+    'first_name' 			=> 'Vorname',
     'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
-    'last_login'  			=> 'Last Login',
-    'last_name'  			=> 'Last Name',
-    'location'  			=> 'Location',
+    'inherit'  				=> 'Vererben',
+    'job' 					=> 'Berufsbezeichnung',
+    'last_login'  			=> 'Letzte Anmeldung',
+    'last_name'  			=> 'Familienname',
+    'location'  			=> 'Ort',
     'manager' 				=> 'Manager',
     'name' 					=> 'Name',
-    'password_confirm' 		=> 'Confirm Password',
-    'password' 				=> 'Password',
-    'phone'  				=> 'Phone',
-    'title' 				=> 'Title',
-    'updateuser' 			=> 'Update User',
-    'username' 				=> 'Username',
+    'password_confirm' 		=> 'Kennwort bestätigen',
+    'password' 				=> 'Passwort',
+    'phone'  				=> 'Telefonnummer',
+    'title' 				=> 'Titel',
+    'updateuser' 			=> 'Benutzer aktualisieren',
+    'username' 				=> 'Benutzernamen',
     'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
-    'cloneuser'                         => 'Clone User',
-    'viewusers' 			=> 'View Users',
+    'cloneuser'                         => 'Benutzer kopieren',
+    'viewusers' 			=> 'Benutzer anzeigen',
 );

app/lang/de/button.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'edit'    => 'Bearbeiten',
+    'delete'  => 'Löschen',
+    'restore' => 'Wiederherstellen',
+    'actions' => 'Aktionen',
+    'submit'  => 'Abschicken',
 
 );

app/lang/de/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Zurück',
 
-    'next'     => 'Next »',
+    'next'     => 'Vor »',
 
 );

app/lang/de/reminders.php

@@ -13,12 +13,12 @@ return array(
     |
     */
 
-    "password" => "Passwords must be six characters and match the confirmation.",
+    "password" => "Das Passwort muss Sechs Zeichen haben und übereinstimmen.",
 
-    "user"     => "Username or email address is incorrect",
+    "user"     => "Benutzername oder Email-Adresse sind falsch",
 
     "token"    => "This password reset token is invalid.",
 
-    "sent" => "If a matching email address was found, a password reminder has been sent!",
+    "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!",
 
 );

app/lang/de/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Aktionen',
+    'action' 		=> 'Aktion',
+    'by'      		=> 'Von',
 
 );

app/lang/en-GB/admin/categories/general.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'about_asset_categories' 			=> 'About Asset Categories',
+    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
+    'asset_categories' 					=> 'Asset Categories',
+    'category_name'  					=> 'Category Name',
+    'create'  							=> 'Create Category',
+    'update'  							=> 'Update Category',
+
+);

app/lang/en-GB/admin/categories/message.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Category does not exist.',
+    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Category updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this category?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'The category was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/categories/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'      => 'ID',
+    'parent'   => 'Parent',
+    'title'      => 'Asset Category Name',
+
+);

app/lang/en-GB/admin/depreciations/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create_depreciation'  					=> 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'number_of_months'  					=> 'Number of Months',
+    'update_depreciation'  					=> 'Update Depreciation',
+
+);

app/lang/en-GB/admin/depreciations/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/depreciations/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+    'id'      => 'ID',
+    'months'   => 'Months',
+    'term'   => 'Term',
+    'title'      => 'Name ',
+
+);

app/lang/en-GB/admin/groups/message.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this group?',
+        'create' => 'There was an issue creating the group. Please try again.',
+        'update' => 'There was an issue updating the group. Please try again.',
+        'delete' => 'There was an issue deleting the group. Please try again.',
+    ),
+
+);

app/lang/en-GB/admin/groups/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);

app/lang/en-GB/admin/groups/titles.php

@@ -0,0 +1,13 @@
+<?php
+
+return array(
+
+    'group_management' 	 	=> 'Group Management',
+    'create_group' 	 		=> 'Create New Group',
+    'edit_group' 	 		=> 'Edit Group',
+    'group_name' 	 		=> 'Group Name',
+    'group_admin' 	 		=> 'Group Admin',
+    'allow' 	 			=> 'Allow',
+    'deny' 	 				=> 'Deny',
+
+);

app/lang/en-GB/admin/hardware/form.php

@@ -0,0 +1,34 @@
+<?php
+
+return array(
+
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciates_on'	=> 'Depreciates On',
+    'depreciation'		=> 'Depreciation',
+    'default_location'	=> 'Default Location',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expires'			=> 'Expires',
+    'fully_depreciated'	=> 'Fully Depreciated',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
+    'manufacturer'		=> 'Manufacturer',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'supplier'			=> 'Supplier',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+    'years'				=> 'years',
+)
+;

app/lang/en-GB/admin/hardware/general.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'asset'  					=> 'Asset',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset to User',
+    'clone'  					=> 'Clone Asset',
+    'edit'  					=> 'Edit Asset',
+    'pending'  					=> 'Pending Asset',
+    'view'  					=> 'View Asset',
+);

app/lang/en-GB/admin/hardware/message.php

@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
+    'does_not_exist' 	=> 'Asset does not exist.',
+    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+
+    'create' => array(
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   		=> 'Asset was not updated, please try again',
+        'success' 		=> 'Asset updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'success' 		=> 'The asset was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+);

app/lang/en-GB/admin/hardware/table.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'book_value'  	=> 'Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+
+);

app/lang/en-GB/admin/licenses/form.php

@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'cost'              => 'Purchase Cost',
+    'create'            => 'Create License',
+    'date'              => 'Purchase Date',
+    'depreciation'      => 'Depreciation',
+    'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'notes'             => 'Notes',
+    'order'             => 'Order No.',
+    'purchase_order'    => 'Purchase Order Number',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'serial'            => 'Serial',
+    'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);

app/lang/en-GB/admin/licenses/general.php

@@ -0,0 +1,19 @@
+<?php
+
+return array(
+
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+);

app/lang/en-GB/admin/licenses/message.php

@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist.',
+    'user_does_not_exist' => 'User does not exist.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        'success' => 'License created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'License was not updated, please try again',
+        'success' => 'License updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully'
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);

app/lang/en-GB/admin/licenses/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);

app/lang/en-GB/admin/locations/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/locations/table.php

@@ -0,0 +1,15 @@
+<?php
+
+return array(
+
+    'id'      		=> 'ID',
+    'city'   		=> 'City',
+    'state'   		=> 'State',
+    'country'   	=> 'Country',
+    'create'		=> 'Create Location',
+    'update'		=> 'Update Location',
+    'name'			=> 'Location Name',
+    'address'		=> 'Address',
+    'zip'			=> 'Postal Code',
+    'locations'		=> 'Locations',
+);

app/lang/en-GB/admin/manufacturers/message.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Manufacturer does not exist.',
+    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
+        'success' => 'The Manufacturer was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/manufacturers/table.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'ID',
+    'name'      			=> 'Manufacturer Name',
+    'update'				=> 'Update Manufacturer',
+
+);

app/lang/en-GB/admin/models/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Model does not exist.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/models/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Model No.',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Assets',
+    'title'					=> 'Asset Models',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);

app/lang/en-GB/admin/reports/general.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'info'   => 'Select the options you want for your asset report.'
+);

app/lang/en-GB/admin/reports/message.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'error'   => 'You must select at least ONE option.'
+);

app/lang/en-GB/admin/settings/general.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'display_asset_name'        => 'Display Asset Name',
+    'display_checkout_date'     => 'Display Checkout Date',
+    'display_eol'               => 'Display EOL in table view',
+    'display_qr'                => 'Display QR Codes',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'laravel'                   => 'Laravel Version',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP Version',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'QR Code Text',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
+    'site_name'                 => 'Site Name',
+    'system'                    => 'System Information',
+    'update'                    => 'Update Settings',
+    'value'                     => 'Value',
+);

app/lang/en-GB/admin/settings/message.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+
+    'update' => array(
+        'error'   => 'An error has occurred while updating. ',
+        'success' => 'Settings updated successfully.'
+    ),
+
+);

app/lang/en-GB/admin/statuslabels/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this status label?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/statuslabels/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+    'name'      	=> 'Status Name',
+    'title'      	=> 'Status Labels',
+    'update'      	=> 'Update Status Label',
+    'create'      	=> 'Create Status Label',
+    'about'      	=> 'About Status Labels',
+    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+);

app/lang/en-GB/admin/suppliers/message.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Supplier does not exist.',
+    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.'
+    )
+
+);

app/lang/en-GB/admin/suppliers/table.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'ID',
+    'licenses'              => 'Licenses',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'url'                   => 'URL',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);

app/lang/en-GB/admin/users/general.php

@@ -0,0 +1,14 @@
+<?php
+
+
+return array(
+
+    'assets_user'  		=> 'Assets assigned to :name',
+    'clone'  			=> 'Clone User',
+    'contact_user'  	=> 'Contact :name',
+    'edit'  			=> 'Edit User',
+    'history_user'  	=> 'History for :name',
+    'last_login'  		=> 'Last Login',
+    'software_user'  	=> 'Software Checked out to :name',
+    'view_user'  		=> 'View User :name',
+    );

app/lang/en-GB/admin/users/message.php

@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+    'user_exists'              	=> 'User already exists!',
+    'user_not_found'           	=> 'User [:id] does not exist.',
+    'user_login_required'      	=> 'The login field is required',
+    'user_password_required'   	=> 'The password is required.',
+    'insufficient_permissions' 	=> 'Insufficient Permissions.',
+    'user_deleted_warning' 		=> 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+
+
+    'success' => array(
+        'create'    => 'User was successfully created.',
+        'update'    => 'User was successfully updated.',
+        'delete'    => 'User was successfully deleted.',
+        'ban'       => 'User was successfully banned.',
+        'unban'     => 'User was successfully unbanned.',
+        'suspend'   => 'User was successfully suspended.',
+        'unsuspend' => 'User was successfully unsuspended.',
+        'restored'  => 'User was successfully restored.'
+    ),
+
+    'error' => array(
+        'create' => 'There was an issue creating the user. Please try again.',
+        'update' => 'There was an issue updating the user. Please try again.',
+        'delete' => 'There was an issue deleting the user. Please try again.',
+        'unsuspend' => 'There was an issue unsuspending the user. Please try again.'
+    ),
+
+);

app/lang/en-GB/admin/users/table.php

@@ -0,0 +1,32 @@
+<?php
+
+return array(
+
+    'activated'  			=> 'Active',
+    'allow'  				=> 'Allow',
+    'checkedout'  			=> 'Assets',
+    'created_at' 			=> 'Created',
+    'createuser' 			=> 'Create User',
+    'deny'  				=> 'Deny',
+    'email'      			=> 'Email',
+    'employee_num'      	=> 'Employee No.',
+    'first_name' 			=> 'First Name',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Inherit',
+    'job' 					=> 'Job Title',
+    'last_login'  			=> 'Last Login',
+    'last_name'  			=> 'Last Name',
+    'location'  			=> 'Location',
+    'manager' 				=> 'Manager',
+    'name' 					=> 'Name',
+    'password_confirm' 		=> 'Confirm Password',
+    'password' 				=> 'Password',
+    'phone'  				=> 'Phone',
+    'title' 				=> 'Title',
+    'updateuser' 			=> 'Update User',
+    'username' 				=> 'Username',
+    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'cloneuser'                         => 'Clone User',
+    'viewusers' 			=> 'View Users',
+);

app/lang/en-GB/auth/message.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'An account with the this email already exists.',
+    'account_not_found'      => 'The email account or password is incorrect.',
+    'account_not_activated'  => 'This user account is not activated.',
+    'account_suspended'      => 'This user account is suspended.',
+    'account_banned'         => 'This user account is banned.',
+
+    'signin' => array(
+        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'success' => 'You have successfully logged in.',
+    ),
+
+    'signup' => array(
+        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'success' => 'Account sucessfully created.',
+    ),
+
+        'forgot-password' => array(
+            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+            'success' => 'Password recovery email successfully sent.',
+        ),
+
+        'forgot-password-confirm' => array(
+            'error'   => 'There was a problem while trying to reset your password, please try again.',
+            'success' => 'Your password has been successfully reset.',
+        ),
+
+    'activate' => array(
+        'error'   => 'There was a problem while trying to activate your account, please try again.',
+        'success' => 'Your account has been successfully activated.',
+    ),
+
+);

app/lang/en-GB/button.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'edit'    => 'Edit',
+    'delete'  => 'Delete',
+    'restore' => 'Restore',
+    'actions' => 'Actions',
+    'submit'  => 'Submit',
+
+);

app/lang/en-GB/general.php

@@ -0,0 +1,94 @@
+<?php
+
+return array(
+
+    'address'				=> 'Address',
+    'admin'					=> 'Admin',
+    'all_assets'			=> 'All Assets',
+    'all'       			=> 'All',
+    'asset_models'			=> 'Asset Models',
+    'asset'					=> 'Asset',
+    'asset_report'          => 'Asset Report',
+    'asset_tag'				=> 'Asset Tag',
+    'assets_available'		=> 'assets available',
+    'assets'				=> 'Assets',
+    'avatar_delete'         => 'Delete Avatar',
+    'avatar_upload'         => 'Upload Avatar',
+    'back'      			=> 'Back',
+    'cancel'  				=> 'Cancel',
+    'categories'			=> 'Asset Categories',
+    'category'				=> 'Asset Category',
+    'changeemail'  			=> 'Change Email Address',
+    'changepassword'  		=> 'Change Password',
+    'checkin'  				=> 'Checkin',
+    'checkout'  			=> 'Checkout',
+    'city'  				=> 'City',
+    'country'  				=> 'Country',
+    'create'				=> 'Create New',
+    'created_asset'			=> 'created asset',
+    'created_at' 			=> 'Created at',
+    'currency'  			=> '£',
+    'current'  				=> 'Current',
+    'custom_report'         => 'Custom Asset Report',
+    'date'					=> 'Date',
+    'delete'  				=> 'Delete',
+    'deleted'  				=> 'Deleted',
+    'deployed'				=> 'Deployed',
+    'depreciation_report'	=> 'Depreciation Report',
+    'depreciation'			=> 'Depreciation',
+    'editprofile'  			=> 'Edit Your Profile',
+    'eol'					=> 'EOL',
+    'first_name'			=> 'First Name',
+    'generate'				=> 'Generate',
+    'groups'				=> 'Groups',
+    'gravatar_email'        => 'Gravatar Email Address',
+    'history_for'  			=> 'History for',
+    'id'  					=> 'ID',
+    'image_delete'         => 'Delete Image',
+    'image_upload'         => 'Upload Image',
+    'last_name'				=> 'Last Name',
+    'license'				=> 'License',
+    'license_report'        => 'License Report',
+    'licenses_available'	=> 'licenses available',
+    'licenses'				=> 'Licenses',
+    'list_all'				=> 'List All',
+    'location'              => 'Location',
+    'locations'				=> 'Locations',
+    'logout'				=> 'Logout',
+    'manufacturer'			=> 'Manufacturer',
+    'manufacturers'			=> 'Manufacturers',
+    'model_no'				=> 'Model No.',
+    'months'				=> 'months',
+    'moreinfo'				=> 'More Info',
+    'name'					=> 'Name',
+    'no_depreciation'		=> 'No Depreciation',
+    'no_results'			=> 'No Results.',
+    'no'  					=> 'No',
+    'notes'  				=> 'Notes',
+    'pending'				=> 'Pending',
+    'people'				=> 'People',
+    'per_page'				=> 'Results Per Page',
+    'profile'				=> 'Your profile',
+    'ready_to_deploy'		=> 'Ready to Deploy',
+    'reports'				=> 'Reports',
+    'save'  				=> 'Save',
+    'settings'				=> 'Settings',
+    'sign_in'				=> 'Sign in',
+    'site_name'				=> 'Site Name',
+    'state'  				=> 'State',
+    'status_labels'			=> 'Status Labels',
+    'status'    			=> 'Status',
+    'suppliers'  			=> 'Suppliers',
+    'total_assets'			=> 'total assets',
+    'total_licenses'		=> 'total licenses',
+    'undeployable'			=> 'Un-deployable',
+    'unknown_admin'			=> 'Unknown Admin',
+    'user'					=> 'User',
+    'viewassets'  			=> 'View Assigned Assets',
+    'website'               => 'Website',
+    'welcome'				=> 'Welcome, :name',
+    'years'					=> 'years',
+    'yes' 					=> 'Yes',
+    'zip'  					=> 'Zip',
+
+);

app/lang/en-GB/pagination.php

@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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; Previous',
+
+    'next'     => 'Next &raquo;',
+
+);

app/lang/en-GB/reminders.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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" => "Passwords must be six characters and match the confirmation.",
+
+    "user"     => "Username or email address is incorrect",
+
+    "token"    => "This password reset token is invalid.",
+
+    "sent" => "If a matching email address was found, a password reminder has been sent!",
+
+);

app/lang/en-GB/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'actions'	 	=> 'Actions',
+    'action' 		=> 'Action',
+    'by'      		=> 'By',
+
+);

app/lang/en-GB/validation.php

@@ -0,0 +1,95 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => "The :attribute must be accepted.",
+    "active_url"       => "The :attribute is not a valid URL.",
+    "after"            => "The :attribute must be a date after :date.",
+    "alpha"            => "The :attribute may only contain letters.",
+    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
+    "alpha_num"        => "The :attribute may only contain letters and numbers.",
+    "before"           => "The :attribute must be a date before :date.",
+    "between"          => array(
+        "numeric" => "The :attribute must be between :min - :max.",
+        "file"    => "The :attribute must be between :min - :max kilobytes.",
+        "string"  => "The :attribute must be between :min - :max characters.",
+    ),
+    "confirmed"        => "The :attribute confirmation does not match.",
+    "date"             => "The :attribute is not a valid date.",
+    "date_format"      => "The :attribute does not match the format :format.",
+    "different"        => "The :attribute and :other must be different.",
+    "digits"           => "The :attribute must be :digits digits.",
+    "digits_between"   => "The :attribute must be between :min and :max digits.",
+    "email"            => "The :attribute format is invalid.",
+    "exists"           => "The selected :attribute is invalid.",
+    "image"            => "The :attribute must be an image.",
+    "in"               => "The selected :attribute is invalid.",
+    "integer"          => "The :attribute must be an integer.",
+    "ip"               => "The :attribute must be a valid IP address.",
+    "max"              => array(
+        "numeric" => "The :attribute may not be greater than :max.",
+        "file"    => "The :attribute may not be greater than :max kilobytes.",
+        "string"  => "The :attribute may not be greater than :max characters.",
+    ),
+    "mimes"            => "The :attribute must be a file of type: :values.",
+    "min"              => array(
+        "numeric" => "The :attribute must be at least :min.",
+        "file"    => "The :attribute must be at least :min kilobytes.",
+        "string"  => "The :attribute must be at least :min characters.",
+    ),
+    "not_in"           => "The selected :attribute is invalid.",
+    "numeric"          => "The :attribute must be a number.",
+    "regex"            => "The :attribute format is invalid.",
+    "required"         => "The :attribute field is required.",
+    "required_if"      => "The :attribute field is required when :other is :value.",
+    "required_with"    => "The :attribute field is required when :values is present.",
+    "required_without" => "The :attribute field is required when :values is not present.",
+    "same"             => "The :attribute and :other must match.",
+    "size"             => array(
+        "numeric" => "The :attribute must be :size.",
+        "file"    => "The :attribute must be :size kilobytes.",
+        "string"  => "The :attribute must be :size characters.",
+    ),
+    "unique"           => "The :attribute has already been taken.",
+    "url"              => "The :attribute format is invalid.",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(),
+    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);

app/lang/en-PT/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/en/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/en/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/lang/es-ES/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Fecha Compra',
     'depreciation'      => 'Amortización',
     'expiration'        => 'Fecha de vencimiento',
+    'maintained'        => 'Mantenido',
     'name'              => 'Aplicación',
     'no_depreciation'   => 'No Amortizar',
     'notes'             => 'Notas',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Instalaciones',
     'serial'            => 'N. Serie',
     'supplier'          => 'Proveedor',
+    'termination_date'  => 'Fecha de Fin',
     'to_email'          => 'Registrado a Email',
     'to_name'           => 'Registrado a Nombre',
     'update'            => 'Actualizar Licencia',

app/lang/fi/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Ostopäivämäärä',
     'depreciation'      => 'Poistoluokka',
     'expiration'        => 'Viimeinen Käyttöpäivä',
+    'maintained'        => 'Maintained',
     'name'              => 'Ohjelmiston Nimi',
     'no_depreciation'   => 'Ei Poistoluokkaa',
     'notes'             => 'Muistiinpanot',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Käyttäjien lkm',
     'serial'            => 'Sarjanumero',
     'supplier'          => 'Toimittaja',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Lisenssille Määritetty Email',
     'to_name'           => 'Lisenssille Määritetty Nimi',
     'update'            => 'Päivitä Lisenssi',

app/lang/fr/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Date d\'achat',
     'depreciation'      => 'Amortissement',
     'expiration'        => 'Date d\'expiration',
+    'maintained'        => 'Maintained',
     'name'              => 'Nom du logiciel',
     'no_depreciation'   => 'Ne pas amortir',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Postes',
     'serial'            => 'Clé de licence',
     'supplier'          => 'Fournisseur',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'E-mail de la licence',
     'to_name'           => 'Nom de la licence',
     'update'            => 'Mise à jour de la licence',

app/lang/fr/admin/users/table.php

@@ -25,8 +25,8 @@ return array(
     'phone'  				=> 'Téléphone',
     'title' 				=> 'Titre',
     'updateuser' 			=> 'Mettre à jour l\'utilisateur',
-    'username' 				=> 'Username',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'username' 				=> 'Nom d\'utilisateur',
+    'username_note' 		=> '( Ceci est utilisé pour la liaison ne Active Directory , pas pour la connexion. )',
     'cloneuser'                         => 'Cloner l\'utilisateur',
     'viewusers' 			=> 'Voir les utilisateurs',
 );

app/lang/hu/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/it/admin/categories/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_asset_categories' 			=> 'About Asset Categories',
-    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
-    'asset_categories' 					=> 'Asset Categories',
-    'category_name'  					=> 'Category Name',
-    'create'  							=> 'Create Category',
-    'update'  							=> 'Update Category',
+    'about_asset_categories' 			=> 'Categorie di beni',
+    'about_categories'  				=> 'Le categorie degli assets ti aiutano ad organizzare i tuoi beni. Alcuni esempi di categorie possono essere "Desktop", "Laptop", "Mobile Phone" e così via, ma puoi usare le categorie degli assets in qualsiasi modo abbia senso per te. ',
+    'asset_categories' 					=> 'Categorie degli Assets',
+    'category_name'  					=> 'Nome categoria',
+    'create'  							=> 'Crea Categoria',
+    'update'  							=> 'Aggiorna Categoria',
 
 );

app/lang/it/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/ja/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/ko/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/lol/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/ms/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Tarikh Belian',
     'depreciation'      => 'Susut Nilai',
     'expiration'        => 'Tarikh Luput',
+    'maintained'        => 'Maintained',
     'name'              => 'Nama Perisian',
     'no_depreciation'   => 'Tiada Susut Nilai',
     'notes'             => 'Nota',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Kekosongan',
     'serial'            => 'Siri',
     'supplier'          => 'Pembekal',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Lesen Untuk Di \'email\'',
     'to_name'           => 'Lesen Untuk Dinamakan',
     'update'            => 'Kemaskini Lesen',

app/lang/nl/admin/categories/message.php

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
-    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'does_not_exist' => 'Categorie bestaat niet.',
+    'assoc_users'	 => 'Deze categorie is momenteel gekoppeld met ten minste 1 model en kan niet verwijderd worden. Pas uw modellen aan zodat deze categorie niet langer gebruikt wordt en probeer opnieuw.',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Categorie werd  niet aangemaakt. Probeer opnieuw, aub.',
+        'success' => 'Categorie correct aangemaakt.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Categorie werd niet aangepast. Probeer opnieuw, aub.',
+        'success' => 'Categorie correct aangepast.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Bent u zeker dat u deze categorie wilt wissen?',
+        'error'   => 'Er is een probleem opgetreden bij het verwijderen van deze categorie. Probeer opnieuw, aub.',
+        'success' => 'De categorie werd succesvol verwijderd.'
     )
 
 );

app/lang/nl/admin/categories/table.php

@@ -3,7 +3,7 @@
 return array(
 
     'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Bovenliggend',
+    'title'      => 'Materiaal Categorie Naam',
 
 );

app/lang/nl/admin/depreciations/general.php

@@ -1,12 +1,12 @@
 <?php
 
 return array(
-    'about_asset_depreciations'  			=> 'About Asset Depreciations',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-    'asset_depreciations'  					=> 'Asset Depreciations',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
-    'update_depreciation'  					=> 'Update Depreciation',
+    'about_asset_depreciations'  			=> 'Over afschrijving van materiaal',
+    'about_depreciations'  					=> 'U kan de materiaalafschrijving instellen om materiaal af te schrijven op basis van lineaire afschrijving.',
+    'asset_depreciations'  					=> 'Materiaalafschrijvingen',
+    'create_depreciation'  					=> 'Maak afschrijving',
+    'depreciation_name'  					=> 'Afschrijvingsnaam',
+    'number_of_months'  					=> 'Aantal maanden',
+    'update_depreciation'  					=> 'Afschrijving aanpassen',
 
 );

app/lang/nl/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',

app/lang/nl/admin/users/general.php

@@ -3,12 +3,12 @@
 
 return array(
 
-    'assets_user'  		=> 'Assets assigned to :name',
-    'clone'  			=> 'Clone User',
+    'assets_user'  		=> 'Materiaal toegewezen aan :name',
+    'clone'  			=> 'Gebruiker klonen',
     'contact_user'  	=> 'Contact :name',
-    'edit'  			=> 'Edit User',
-    'history_user'  	=> 'History for :name',
-    'last_login'  		=> 'Last Login',
-    'software_user'  	=> 'Software Checked out to :name',
-    'view_user'  		=> 'View User :name',
+    'edit'  			=> 'Gebruiker aanpassen',
+    'history_user'  	=> 'Geschiedenis voor :name',
+    'last_login'  		=> 'Laatst aangemeld',
+    'software_user'  	=> 'Software toegekend aan :name',
+    'view_user'  		=> 'Bekijk gebruiker :name',
     );

app/lang/nl/admin/users/message.php

@@ -2,30 +2,30 @@
 
 return array(
 
-    'user_exists'              	=> 'User already exists!',
-    'user_not_found'           	=> 'User [:id] does not exist.',
-    'user_login_required'      	=> 'The login field is required',
-    'user_password_required'   	=> 'The password is required.',
-    'insufficient_permissions' 	=> 'Insufficient Permissions.',
-    'user_deleted_warning' 		=> 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'user_exists'              	=> 'Gebruiker bestaat reeds!',
+    'user_not_found'           	=> 'Gebruiker [:id] bestaat niet.',
+    'user_login_required'      	=> 'Het veld gebruikersnaam is verplicht.',
+    'user_password_required'   	=> 'Het veld wachtwoord is verplicht.',
+    'insufficient_permissions' 	=> 'Onvoldoende rechten.',
+    'user_deleted_warning' 		=> 'Deze gebruiker werd verwijderd. Om deze gebruiker te bewerken of toe te wijzen aan materiaal, zal deze opnieuw geactiveerd moeten worden.',
 
 
     'success' => array(
-        'create'    => 'User was successfully created.',
-        'update'    => 'User was successfully updated.',
-        'delete'    => 'User was successfully deleted.',
-        'ban'       => 'User was successfully banned.',
-        'unban'     => 'User was successfully unbanned.',
-        'suspend'   => 'User was successfully suspended.',
-        'unsuspend' => 'User was successfully unsuspended.',
-        'restored'  => 'User was successfully restored.'
+        'create'    => 'Gebruiker succesvol aangemaakt.',
+        'update'    => 'Gebruiker succesvol bijgewerkt.',
+        'delete'    => 'Gebruiker succesvol verwijderd.',
+        'ban'       => 'Gebruiker succesvol verbannen.',
+        'unban'     => 'Gebruiker succesvol opnieuw toegang verleend.',
+        'suspend'   => 'Gebruiker werd succesvol uitgeschakeld.',
+        'unsuspend' => 'Gebruiker werd succesvol ingeschakeld.',
+        'restored'  => 'Gebruiker werd succesvol opnieuw geactiveerd.'
     ),
 
     'error' => array(
-        'create' => 'There was an issue creating the user. Please try again.',
-        'update' => 'There was an issue updating the user. Please try again.',
-        'delete' => 'There was an issue deleting the user. Please try again.',
-        'unsuspend' => 'There was an issue unsuspending the user. Please try again.'
+        'create' => 'Er was een probleem tijdens het aanmaken van de gebruiker. Probeer opnieuw, aub.',
+        'update' => 'Er was een probleem tijdens het bijwerken van de gebruiker. Probeer opnieuw, aub.',
+        'delete' => 'Er was een probleem tijdens het verwijderen van de gebruiker. Probeer opnieuw, aub.',
+        'unsuspend' => 'Er was een probleem tijdens het opnieuw inschakelen van de gebruiker. Probeer opnieuw, aub.'
     ),
 
 );

app/lang/nl/auth/message.php

@@ -2,35 +2,35 @@
 
 return array(
 
-    'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The email account or password is incorrect.',
-    'account_not_activated'  => 'This user account is not activated.',
-    'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
+    'account_already_exists' => 'Een account met dit e-mailadres bestaat reeds.',
+    'account_not_found'      => 'E-mailadres of wachtwoord onjuist.',
+    'account_not_activated'  => 'Deze gebruikersaccount is niet actief.',
+    'account_suspended'      => 'Deze gebruikersaccount is vergrendeld.',
+    'account_banned'         => 'Deze gebruikersaccount is geband.',
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'Er was een probleem bij inloggen, probeer opnieuw aub.',
+        'success' => 'U bent succesvol aangemeld.',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'Er was een probleem bij het aanmaken van uw account, probeer opnieuw aub.',
+        'success' => 'Gebruikersaccount succesvol aangemaakt.',
     ),
 
         'forgot-password' => array(
-            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
-            'success' => 'Password recovery email successfully sent.',
+            'error'   => 'Er was een probleem bij het ophalen van de paswoord herstelcode, probeer opnieuw aub.',
+            'success' => 'E-mail voor wachtwoordsherstel werd succesvol verzonden.',
         ),
 
         'forgot-password-confirm' => array(
-            'error'   => 'There was a problem while trying to reset your password, please try again.',
-            'success' => 'Your password has been successfully reset.',
+            'error'   => 'Er was een probleem bij het opnieuw instellen van uw wachtwoord, probeer opnieuw aub.',
+            'success' => 'Uw wachtwoord werd hersteld.',
         ),
 
     'activate' => array(
-        'error'   => 'There was a problem while trying to activate your account, please try again.',
-        'success' => 'Your account has been successfully activated.',
+        'error'   => 'Er was een probleem met de activatie van uw account, probeer opnieuw aub.',
+        'success' => 'Uw account werd succesvol geactiveerd.',
     ),
 
 );

app/lang/nl/button.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'edit'    => 'Bewerk',
+    'delete'  => 'Verwijder',
+    'restore' => 'Herstel',
+    'actions' => 'Acties',
+    'submit'  => 'Verzenden',
 
 );

app/lang/nl/general.php

@@ -2,93 +2,93 @@
 
 return array(
 
-    'address'				=> 'Address',
-    'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
-    'asset_models'			=> 'Asset Models',
-    'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
-    'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
-    'assets'				=> 'Assets',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'cancel'  				=> 'Cancel',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
-    'created_asset'			=> 'created asset',
-    'created_at' 			=> 'Created at',
+    'address'				=> 'Adres',
+    'admin'					=> 'Beheerder',
+    'all_assets'			=> 'Alle materialen',
+    'all'       			=> 'Alle',
+    'asset_models'			=> 'Materiaalmodel',
+    'asset'					=> 'Materiaal',
+    'asset_report'          => 'Materiaalrapport',
+    'asset_tag'				=> 'Materiaaltag',
+    'assets_available'		=> 'beschikbare materialen',
+    'assets'				=> 'Materialen',
+    'avatar_delete'         => 'Verwijder profielafbeelding',
+    'avatar_upload'         => 'Upload profielafbeelding',
+    'back'      			=> 'Terug',
+    'cancel'  				=> 'Annuleren',
+    'categories'			=> 'Materiaal Categorieën',
+    'category'				=> 'Materiaalcategorie',
+    'changeemail'  			=> 'E-mailadres wijzigen',
+    'changepassword'  		=> 'Wachtwoord wijzigen',
+    'checkin'  				=> 'Check-in',
+    'checkout'  			=> 'Afrekenen',
+    'city'  				=> 'Plaats',
+    'country'  				=> 'Land',
+    'create'				=> 'Nieuwe aanmaken',
+    'created_asset'			=> 'aangemaakt materiaal',
+    'created_at' 			=> 'Aangemaakt op',
     'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
-    'editprofile'  			=> 'Edit Your Profile',
+    'current'  				=> 'Huidige',
+    'custom_report'         => 'Handmatig Materiaal Rapport',
+    'date'					=> 'Datum',
+    'delete'  				=> 'Verwijder',
+    'deleted'  				=> 'Verwijderd',
+    'deployed'				=> 'Ingezet',
+    'depreciation_report'	=> 'Afschrijvingsrapport',
+    'depreciation'			=> 'Afschrijving',
+    'editprofile'  			=> 'Bewerk jouw profiel',
     'eol'					=> 'EOL',
-    'first_name'			=> 'First Name',
-    'generate'				=> 'Generate',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
-    'history_for'  			=> 'History for',
+    'first_name'			=> 'Voornaam',
+    'generate'				=> 'Genereer',
+    'groups'				=> 'Groepen',
+    'gravatar_email'        => 'Gravatar E-mailadres',
+    'history_for'  			=> 'Geschiedenis van',
     'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
-    'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
-    'logout'				=> 'Logout',
-    'manufacturer'			=> 'Manufacturer',
-    'manufacturers'			=> 'Manufacturers',
-    'model_no'				=> 'Model No.',
-    'months'				=> 'months',
-    'moreinfo'				=> 'More Info',
-    'name'					=> 'Name',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
-    'notes'  				=> 'Notes',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
-    'profile'				=> 'Your profile',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
-    'save'  				=> 'Save',
-    'settings'				=> 'Settings',
-    'sign_in'				=> 'Sign in',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
+    'image_delete'         => 'Afbeelding verwijderen',
+    'image_upload'         => 'Afbeelding uploaden',
+    'last_name'				=> 'Achternaam',
+    'license'				=> 'Licentie',
+    'license_report'        => 'Licentierapport',
+    'licenses_available'	=> 'beschikbare licenties',
+    'licenses'				=> 'Licenties',
+    'list_all'				=> 'Toon Alles',
+    'location'              => 'Locatie',
+    'locations'				=> 'Locaties',
+    'logout'				=> 'Afmelden',
+    'manufacturer'			=> 'Fabrikant',
+    'manufacturers'			=> 'Fabrikanten',
+    'model_no'				=> 'Modelnummer',
+    'months'				=> 'maanden',
+    'moreinfo'				=> 'Meer Info',
+    'name'					=> 'Naam',
+    'no_depreciation'		=> 'Geen afschrijving',
+    'no_results'			=> 'Geen resultaten.',
+    'no'  					=> 'Neen',
+    'notes'  				=> 'Notities',
+    'pending'				=> 'In afwachting',
+    'people'				=> 'Personen',
+    'per_page'				=> 'Resultaten per pagina',
+    'profile'				=> 'Uw profiel',
+    'ready_to_deploy'		=> 'Klaar om ingezet te worden',
+    'reports'				=> 'Rapporten',
+    'save'  				=> 'Opslaan',
+    'settings'				=> 'Instellingen',
+    'sign_in'				=> 'Aanmelden',
+    'site_name'				=> 'Sitenaam',
+    'state'  				=> 'Status',
+    'status_labels'			=> 'Statuslabels',
     'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'user'					=> 'User',
-    'viewassets'  			=> 'View Assigned Assets',
+    'suppliers'  			=> 'Leveranciers',
+    'total_assets'			=> 'totaal aantal materialen',
+    'total_licenses'		=> 'Totale licenties',
+    'undeployable'			=> 'Niet-inzetbaar',
+    'unknown_admin'			=> 'Onbekende Beheerder',
+    'user'					=> 'Gebruiker',
+    'viewassets'  			=> 'Bekijk toegekende materialen',
     'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'welcome'				=> 'Welkom :name',
+    'years'					=> 'jaren',
+    'yes' 					=> 'Ja',
+    'zip'  					=> 'Postcode',
 
 );

app/lang/nl/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Vorige',
 
-    'next'     => 'Next »',
+    'next'     => 'Volgende »',
 
 );

app/lang/nl/reminders.php

@@ -13,12 +13,12 @@ return array(
     |
     */
 
-    "password" => "Passwords must be six characters and match the confirmation.",
+    "password" => "Paswoorden moeten 6 karakters lang zijn en gelijk zijn in beide paswoordvelden.",
 
-    "user"     => "Username or email address is incorrect",
+    "user"     => "Gebruikersnaam of e-mailadres is niet correct",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "De token voor paswoordherstel is niet correct.",
 
-    "sent" => "If a matching email address was found, a password reminder has been sent!",
+    "sent" => "Indien het e-mailadres bestaat, werd een paswoordhint verstuurd",
 
 );

app/lang/nl/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Acties',
+    'action' 		=> 'Actie',
+    'by'      		=> 'Door',
 
 );

app/lang/nl/validation.php

@@ -13,23 +13,23 @@ return array(
     |
     */
 
-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => ":attribute moet geaccepteerd worden.",
+    "active_url"       => ":attribute is geen geldige URL.",
+    "after"            => ":attribute moet een datum zijn later dan :date.",
+    "alpha"            => ":attribute mag enkel letters bevatten.",
+    "alpha_dash"       => ":attribute mag enkel letters, cijfers of koppeltekens bevatten.",
+    "alpha_num"        => ":attribute mag enkel letters en cijfers bevatten.",
+    "before"           => ":attribute moet een datum zijn voor :date.",
     "between"          => array(
-        "numeric" => "The :attribute must be between :min - :max.",
-        "file"    => "The :attribute must be between :min - :max kilobytes.",
-        "string"  => "The :attribute must be between :min - :max characters.",
+        "numeric" => ":attribute moet een waarde hebben tussen :min en :max.",
+        "file"    => ":attribute moet een waarde hebben tussen :min en :max kilobytes.",
+        "string"  => ":attribute moet tussen de :min en :max aantal karakters lang zijn.",
     ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
-    "date_format"      => "The :attribute does not match the format :format.",
-    "different"        => "The :attribute and :other must be different.",
-    "digits"           => "The :attribute must be :digits digits.",
+    "confirmed"        => ":attribute bevestiging komt niet overeen.",
+    "date"             => ":attribute is geen geldige datum.",
+    "date_format"      => ":attribute komt niet overeen met het volgende formaat :format.",
+    "different"        => ":attribute en :other moeten verschillend zijn.",
+    "digits"           => ":attribute moet :digits cijfers lang zijn.",
     "digits_between"   => "The :attribute must be between :min and :max digits.",
     "email"            => "The :attribute format is invalid.",
     "exists"           => "The selected :attribute is invalid.",

app/lang/no/admin/hardware/form.php

@@ -11,24 +11,24 @@ return array(
     'depreciation'		=> 'Avskrivning',
     'default_location'	=> 'Standard plassering',
     'eol_date'			=> 'EOL dato',
-    'eol_rate'			=> 'EOL Rate',
+    'eol_rate'			=> 'EOL-rate',
     'expires'			=> 'Utløper',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
-    'manufacturer'		=> 'Manufacturer',
-    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
+    'fully_depreciated'	=> 'Ferdig nedskrevet',
+    'help_checkout'		=> 'Hvis du vil tilordne denne eiendelen øyeblikkelig, velger du "Klar for distribusjon" fra statuslista over. Hvis ikke kan uventede ting skje. ',
+    'manufacturer'		=> 'Produsent',
+    'model'				=> 'Modell',
+    'months'			=> 'måneder',
+    'name'				=> 'Navn',
+    'notes'				=> 'Notater',
+    'order'				=> 'Ordrenummer',
+    'qr'				=> 'QR-kode',
+    'requestable'		=> 'Brukere kan be om eiendel',
+    'serial'			=> 'Serienummer',
     'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
+    'supplier'			=> 'Leverandør',
     'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'update'			=> 'Oppdater eiendel',
+    'warranty'			=> 'Garanti',
+    'years'				=> 'år',
 )
 ;

app/lang/no/admin/hardware/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'asset'  					=> 'Asset',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset to User',
-    'clone'  					=> 'Clone Asset',
-    'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
-    'view'  					=> 'View Asset',
+    'asset'  					=> 'Eiendel',
+    'checkin'  					=> 'Sjekk inn eiendel',
+    'checkout'  				=> 'Sjekk ut eiendel til bruker',
+    'clone'  					=> 'Klon eiendel',
+    'edit'  					=> 'Rediger eiendel',
+    'pending'  					=> 'Ventende eiendel',
+    'view'  					=> 'Vis eiendel',
 );

app/lang/no/admin/hardware/message.php

@@ -2,36 +2,36 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'undeployable' 		=> '<strong>Advarsel:</strong> Denne eiendelen er merket som ikke utplasserbar. Vennligst endre status for eiendel dette har endret seg.',
+    'does_not_exist' 	=> 'Eiendel eksisterer ikke.',
+    'assoc_users'	 	=> 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ',
 
     'create' => array(
-        'error'   		=> 'Asset was not created, please try again. :(',
-        'success' 		=> 'Asset created successfully. :)'
+        'error'   		=> 'Eiendelen ble ikke opprettet, prøv igjen :(',
+        'success' 		=> 'Eiendelen ble opprettet :)'
     ),
 
     'update' => array(
-        'error'   		=> 'Asset was not updated, please try again',
-        'success' 		=> 'Asset updated successfully.'
+        'error'   		=> 'Eiendelen ble ikke oppdatert, prøv igjen',
+        'success' 		=> 'Oppdatering av eiendel vellykket.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this asset?',
-        'error'   		=> 'There was an issue deleting the asset. Please try again.',
-        'success' 		=> 'The asset was deleted successfully.'
+        'confirm'   	=> 'Er du sikker på at du vil slette eiendelen?',
+        'error'   		=> 'Det oppstod et problem under sletting av eiendel. Vennligst prøv igjen.',
+        'success' 		=> 'Vellykket sletting av eiendel.'
     ),
 
     'checkout' => array(
-        'error'   		=> 'Asset was not checked out, please try again',
-        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Eiendel ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Asset was not checked in, please try again',
-        'success' 		=> 'Asset checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Eiendel ble ikke sjekket inn. Prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.'
     )
 
 );

app/lang/no/admin/hardware/table.php

@@ -3,20 +3,20 @@
 return array(
 
     'asset_tag'   	=> 'Asset Tag',
-    'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
+    'asset_model'       => 'Modell',
+    'book_value'  	=> 'Verdi',
+    'change' 		=> 'Inne/ute',
+    'checkout_date' => 'Utsjekkdato',
+    'checkoutto' 	=> 'Utsjekket',
+    'diff' 			=> 'Forskjell',
+    'dl_csv' 		=> 'Last ned CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
+    'location' 		=> 'Plassering',
+    'purchase_cost'	=> 'Kostnad',
+    'purchase_date'	=> 'Kjøpt',
+    'serial'   		=> 'Serienummer',
     'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
+    'title'      	=> 'Eiendel ',
 
 );

app/lang/no/admin/licenses/form.php

@@ -2,24 +2,26 @@
 
 return array(
 
-    'asset'             => 'Asset',
-    'checkin'           => 'Checkin',
-    'cost'              => 'Purchase Cost',
-    'create'            => 'Create License',
-    'date'              => 'Purchase Date',
-    'depreciation'      => 'Depreciation',
-    'expiration'        => 'Expiration Date',
-    'name'              => 'Software Name',
-    'no_depreciation'   => 'Do Not Depreciate',
-    'notes'             => 'Notes',
-    'order'             => 'Order No.',
-    'purchase_order'    => 'Purchase Order Number',
-    'remaining_seats'   => 'Remaining Seats',
-    'seats'             => 'Seats',
-    'serial'            => 'Serial',
-    'supplier'          => 'Supplier',
-    'to_email'          => 'Licensed to Email',
-    'to_name'           => 'Licensed to Name',
-    'update'            => 'Update License',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'asset'             => 'Eiendel',
+    'checkin'           => 'Sjekk inn',
+    'cost'              => 'Innkjøpskostnad',
+    'create'            => 'Opprett lisens',
+    'date'              => 'Innkjøpsdato',
+    'depreciation'      => 'Avskrivning',
+    'expiration'        => 'Utløpsdato',
+    'maintained'        => 'Maintained',
+    'name'              => 'Navn programvare',
+    'no_depreciation'   => 'Ingen avskrivning',
+    'notes'             => 'Notater',
+    'order'             => 'Ordrenummer',
+    'purchase_order'    => 'Innkjøpsordrenummer',
+    'remaining_seats'   => 'Gjenværende setelisenser',
+    'seats'             => 'Setelisenser',
+    'serial'            => 'Serienummer',
+    'supplier'          => 'Leverandør',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Lisensiert til e-post',
+    'to_name'           => 'Lisensiert til navn',
+    'update'            => 'Oppdater lisens',
+    'checkout_help'     => 'Du må sjekke ut en lisens til en maskinvare- eller person-eiendel. Du kan velge begge, men eier av eiendel må være lik den du sjekker eiendel ut til.'
 );

app/lang/no/admin/licenses/general.php

@@ -2,18 +2,18 @@
 
 return array(
 
-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout History',
-    'checkout'  				=> 'Checkout License Seat',
-    'edit'  					=> 'Edit License',
-    'clone'  					=> 'Clone License',
-    'history_for'  				=> 'History for ',
-    'in_out'  					=> 'In/Out',
-    'info'  					=> 'License Info',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
-    'software_licenses'  		=> 'Software Licenses',
-    'user'  					=> 'User',
-    'view'  					=> 'View License',
+    'checkin'  					=> 'Sjekk inn setelisens',
+    'checkout_history'  		=> 'Utsjekkhistorikk',
+    'checkout'  				=> 'Sjekk ut setelisens',
+    'edit'  					=> 'Rediger lisens',
+    'clone'  					=> 'Klon lisens',
+    'history_for'  				=> 'Historikk for ',
+    'in_out'  					=> 'Inne/ute',
+    'info'  					=> 'Lisensinformasjon',
+    'license_seats'  			=> 'Setelisenser',
+    'seat'  					=> 'Setelisens',
+    'seats'  					=> 'Setelisenser',
+    'software_licenses'  		=> 'Programvarelisenser',
+    'user'  					=> 'Bruker',
+    'view'  					=> 'Vis lisens',
 );

app/lang/no/admin/licenses/message.php

@@ -2,37 +2,37 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist.',
-    'user_does_not_exist' => 'User does not exist.',
-    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
-    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
-    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+    'does_not_exist' => 'Lisens eksisterer ikke.',
+    'user_does_not_exist' => 'Bruker eksisterer ikke.',
+    'asset_does_not_exist' 	=> 'Eiendelen du prøver å koble til denne lisensen eksisterer ikke.',
+    'owner_doesnt_match_asset' => 'Eiendelen du prøver å koble til denne lisensen er eid av noen andre enn personen du har valgt i tildelt til-nedtrekkslista.',
+    'assoc_users'	 => 'Denne lisensen er sjekket ut til en bruker og kan ikke slettes. Vennligst sjekk inn lisensen først, og forsøk sletting på nytt. ',
 
 
     'create' => array(
-        'error'   => 'License was not created, please try again.',
-        'success' => 'License created successfully.'
+        'error'   => 'Lisens ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lisens.'
     ),
 
     'update' => array(
-        'error'   => 'License was not updated, please try again',
-        'success' => 'License updated successfully.'
+        'error'   => 'Lisens ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av lisens.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this license?',
-        'error'   => 'There was an issue deleting the license. Please try again.',
-        'success' => 'The license was deleted successfully.'
+        'confirm'   => 'Er du sikker på at du vil slette denne lisensen?',
+        'error'   => 'Det oppstod et problem under sletting av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av lisens.'
     ),
 
     'checkout' => array(
-        'error'   => 'There was an issue checking out the license. Please try again.',
-        'success' => 'The license was checked out successfully'
+        'error'   => 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket utsjekk av lisens'
     ),
 
     'checkin' => array(
-        'error'   => 'There was an issue checking in the license. Please try again.',
-        'success' => 'The license was checked in successfully'
+        'error'   => 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket innsjekk av lisens'
     ),
 
 );

app/lang/no/admin/licenses/table.php

@@ -2,16 +2,16 @@
 
 return array(
 
-    'assigned_to'   	=> 'Assigned To',
-    'checkout'   		=> 'In/Out',
+    'assigned_to'   	=> 'Tildelt til',
+    'checkout'   		=> 'Inne/ute',
     'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
-    'purchase_date'   	=> 'Purchase Date',
-    'purchased'   		=> 'Purchased',
-    'seats'   			=> 'Seats',
-    'hardware'   		=> 'Hardware',
-    'serial'   			=> 'Serial',
-    'title'      		=> 'License',
+    'license_email'   	=> 'Lisens e-post',
+    'license_name'   	=> 'Lisensiert til',
+    'purchase_date'   	=> 'Kjøpedato',
+    'purchased'   		=> 'Kjøpt',
+    'seats'   			=> 'Setelisenser',
+    'hardware'   		=> 'Maskinvare',
+    'serial'   			=> 'Serienummer',
+    'title'      		=> 'Lisens',
 
 );

app/lang/no/admin/locations/message.php

@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Lokasjon eksisterer ikke.',
+    'assoc_users'	 => 'Denne lokasjonen er i bruk av minst en bruker, og kan ikke slettes. Fjern brukernes kobling mot lokasjonen og prøv igjen. ',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Lokasjon ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lokasjon.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Lokasjon ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av plassering.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this location?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   	=> 'Er du sikker på at du vil slette denne plasseringen?',
+        'error'   => 'Det oppstod et problem under sletting av plassering. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av plassering.'
     )
 
 );

app/lang/no/admin/locations/table.php

@@ -6,10 +6,10 @@ return array(
     'city'   		=> 'By',
     'state'   		=> 'Stat',
     'country'   	=> 'Land',
-    'create'		=> 'Create Location',
-    'update'		=> 'Update Location',
-    'name'			=> 'Location Name',
+    'create'		=> 'Opprett plassering',
+    'update'		=> 'Oppdater plassering',
+    'name'			=> 'Plasseringsnavn',
     'address'		=> 'Adresse',
-    'zip'			=> 'Postal Code',
-    'locations'		=> 'Locations',
+    'zip'			=> 'Postnummer',
+    'locations'		=> 'Plasseringer',
 );

app/lang/no/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Forrige',
 
-    'next'     => 'Next »',
+    'next'     => 'Neste »',
 
 );

app/lang/pl/admin/licenses/form.php

@@ -9,6 +9,7 @@ return array(
     'date'              => 'Purchase Date',
     'depreciation'      => 'Depreciation',
     'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
     'name'              => 'Software Name',
     'no_depreciation'   => 'Do Not Depreciate',
     'notes'             => 'Notes',
@@ -18,6 +19,7 @@ return array(
     'seats'             => 'Seats',
     'serial'            => 'Serial',
     'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
     'to_email'          => 'Licensed to Email',
     'to_name'           => 'Licensed to Name',
     'update'            => 'Update License',