Nicer display if no files have been uploaded

.travis.yml

@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 
@@ -15,14 +19,16 @@ env:
 before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - composer install --prefer-source --no-interaction --no-dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - cp app/config/testing/app.example.php app/config/testing/app.php
+  - cp app/config/testing/database.example.php app/config/testing/database.php
+  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - composer self-update
+  - composer install --prefer-source --no-interaction
+  - php artisan key:generate --env=testing
+  - php artisan migrate:install --env=testing --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
+  - php artisan migrate --env=testing --no-interaction -vvv
+  - php artisan db:seed --env=testing --no-interaction -vvv
 
 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use

CONTRIBUTING.md

@@ -10,6 +10,7 @@ We use Waffle.io to help better communicate our roadmap with users. Our [project
 
 [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
 
+The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
 
 -----
 

app/config/app.php

@@ -27,6 +27,23 @@ return array(
 
     'locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -99,46 +116,47 @@ return array(
 
     'aliases' => array(
 
-            'App'             => 'Illuminate\Support\Facades\App',
-            'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-            'Auth'            => 'Illuminate\Support\Facades\Auth',
-            'Blade'           => 'Illuminate\Support\Facades\Blade',
-            'Cache'           => 'Illuminate\Support\Facades\Cache',
-            'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-            'Config'          => 'Illuminate\Support\Facades\Config',
-            'Controller'      => 'Illuminate\Routing\Controller',
-            'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-            'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-            'DB'              => 'Illuminate\Support\Facades\DB',
-            'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-            'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-            'Event'           => 'Illuminate\Support\Facades\Event',
-            'File'            => 'Illuminate\Support\Facades\File',
-            'Form'            => 'Illuminate\Support\Facades\Form',
-            'Hash'            => 'Illuminate\Support\Facades\Hash',
-            'HTML'            => 'Illuminate\Support\Facades\HTML',
-			'Image'           => 'Intervention\Image\ImageManagerStatic',
-            'Input'           => 'Illuminate\Support\Facades\Input',
-            'Lang'            => 'Illuminate\Support\Facades\Lang',
-            'Log'             => 'Illuminate\Support\Facades\Log',
-            'Mail'            => 'Illuminate\Support\Facades\Mail',
-            'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-            'Password'        => 'Illuminate\Support\Facades\Password',
-            'Queue'           => 'Illuminate\Support\Facades\Queue',
-            'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-            'Redis'           => 'Illuminate\Support\Facades\Redis',
-            'Request'         => 'Illuminate\Support\Facades\Request',
-            'Response'        => 'Illuminate\Support\Facades\Response',
-            'Route'           => 'Illuminate\Support\Facades\Route',
-            'Schema'          => 'Illuminate\Support\Facades\Schema',
-            'Seeder'          => 'Illuminate\Database\Seeder',
-            'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-            'Session'         => 'Illuminate\Support\Facades\Session',
-            'SSH'             => 'Illuminate\Support\Facades\SSH',
-            'Str'             => 'Illuminate\Support\Str',
-            'URL'             => 'Illuminate\Support\Facades\URL',
-            'Validator'       => 'Illuminate\Support\Facades\Validator',
-            'View'            => 'Illuminate\Support\Facades\View'
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
+            'View'            		=> 'Illuminate\Support\Facades\View'
 
     ),
 

app/config/local/app.example.php

@@ -37,7 +37,7 @@ return array(
     | to a random, 32 character string, otherwise these encrypted strings
     | will not be safe. Please do this before deploying an application!
     |
-    | Run a php artisan key:generate --env=staging to create a random one
+    | Run a php artisan key:generate to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/local/database.example.php

@@ -61,6 +61,7 @@ return array(
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
+            'strict'    => false,
         ),
 
         'pgsql' => array(

app/config/testing/database.example.php

@@ -26,7 +26,7 @@ return array(
     |
     */
 
-    'default' => 'sqlite',
+    'default' => 'mysql',
 
     /*
     |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@ return array(
             'database' => ':memory:',
             'prefix'   => ''
         ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
     ),
 
     /*

app/config/testing/mail.example.php

@@ -119,6 +119,6 @@ return array(
     |
     */
 
-    'pretend' => false,
+    'pretend' => true,
 
 );

app/controllers/admin/AssetsController.php

@@ -174,7 +174,7 @@ class AssetsController extends AdminController
             }
 
             if (e(Input::get('assigned_to')) == '') {
-                $asset->assigned_to =  0;
+                $asset->assigned_to =  NULL;
             } else {
                 $asset->assigned_to        = e(Input::get('assigned_to'));
             }
@@ -213,13 +213,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');
+            	if (Input::get('assigned_to')!='') {
+					$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

@@ -18,7 +18,7 @@ use Str;
 use Supplier;
 use Validator;
 use View;
-
+use Response;
 
 class LicensesController extends AdminController
 {
@@ -94,6 +94,18 @@ class LicensesController extends AdminController
                 $license->supplier_id = e(Input::get('supplier_id'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
             // Save the license data
             $license->name              = e(Input::get('name'));
             $license->serial            = e(Input::get('serial'));
@@ -252,6 +264,18 @@ class LicensesController extends AdminController
                     //$license->purchase_cost = e(Input::get('purchase_cost'));
             }
 
+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
 
             //Are we changing the total number of seats?
             if( $license->seats != e(Input::get('seats'))) {
@@ -613,4 +637,135 @@ class LicensesController extends AdminController
         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);
 
     }
+
+
+    /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+		// the license is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($license->id)) {
+
+        	if (Input::hasFile('licensefile')) {
+
+				foreach(Input::file('licensefile') as $file) {
+
+				$rules = array(
+				   'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('licensefile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'license-'.$license->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $license->id;
+						$logaction->asset_type = 'software';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the license is valid
+        if (isset($license->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/licenses/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+		// the license is valid
+        if (isset($license->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
 }

app/database/migrations/2015_02_04_155757_increase_user_field_lengths.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseUserFieldLengths extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(100) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(50) null');
+	}
+
+}

app/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeletedToLog extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"');
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('added_on', 'created_at');
+			$table->timestamp('updated_at');
+            $table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('created_at', 'added_on');
+			$table->dropColumn('updated_at');
+			$table->dropSoftDeletes();
+		});
+	}
+
+}

app/database/seeds/ActionlogSeeder.php

@@ -17,7 +17,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -30,7 +30,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'hardware',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -43,7 +43,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '1',
             'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,
@@ -56,7 +56,7 @@ class ActionlogSeeder extends Seeder
             'asset_id' 			=> '1',
             'checkedout_to' 	=> '2',
             'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
             'asset_type' 		=> 'software',
             'note'				=> NULL,
             'filename'			=> NULL,

app/database/seeds/LicensesSeeder.php

@@ -16,6 +16,8 @@ class LicensesSeeder extends Seeder
             'serial'      		=> 'ZOMG-WtF-BBQ-SRSLY',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 		=> '0',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),
@@ -35,6 +37,8 @@ class LicensesSeeder extends Seeder
             'serial'      		=> '98049890394-340485934',
             'purchase_date' 	=> '2013-10-02',
             'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 	=> '1',
             'order_number'  	=> '987698576946',
             'created_at' 		=> $date->modify('-10 day'),
             'updated_at' 		=> $date->modify('-3 day'),

app/filters.php

@@ -85,7 +85,7 @@ Route::filter('admin-auth', function () {
     // Check if the user has access to the admin pages
     if ( ! Sentry::getUser()->hasAccess('admin')) {
         // Show the insufficient permissions page
-        return Redirect::route('profile');
+        return Redirect::route('view-assets');
     }
 });
 

app/lang/ar/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/cs/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' 			=> 'O kategoriích majetku',
+    'about_categories'  				=> 'Kategorie pomáhají organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod., kategorie můžete ale používat jakkoliv Vám to bude dávat smysl. ',
+    'asset_categories' 					=> 'Kategorie majetku',
+    'category_name'  					=> 'Jméno kategorie',
+    'create'  							=> 'Vytvořit kategorii',
+    'update'  							=> 'Upravit kategorii',
 
 );

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

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Kategorie neexistuje.',
     '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(

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

@@ -3,7 +3,7 @@
 return array(
 
     'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Nadřazená složka',
+    'title'      => 'Jméno kategorie majetku',
 
 );

app/lang/cs/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'  			=> 'O amortizaci majetku',
+    'about_depreciations'  					=> 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
+    'asset_depreciations'  					=> 'Amortizace majetku',
+    'create_depreciation'  					=> 'Vytvořit amortizaci',
+    'depreciation_name'  					=> 'Jméno amortizace',
+    'number_of_months'  					=> 'Počet měsíců',
+    'update_depreciation'  					=> 'Upravit amortizaci',
 
 );

app/lang/cs/admin/depreciations/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Depreciation class does not exist.',
+    'does_not_exist' => 'Amortizační skupina neexistuje.',
     '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. ',
 
 

app/lang/cs/admin/depreciations/table.php

@@ -3,8 +3,8 @@
 return array(
 
     'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'months'   => 'Měsíců',
+    'term'   => 'Podmínka',
+    'title'      => 'Název ',
 
 );

app/lang/cs/admin/groups/message.php

@@ -2,18 +2,18 @@
 
 return array(
 
-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Skupina již existuje!',
+    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_name_required' => 'Název je vyžadován',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Skupina byla úspěšně vytvořena.',
+        'update' => 'Skupina byla úspěšně upravena.',
+        'delete' => 'Skupina byla úspěšně odstraněna.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
+        'confirm'   => 'Určitě chcete odstranit tuto skupinu?',
         '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/cs/admin/groups/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Název',
+    'users'      => '# z uživatelů',
 
 );

app/lang/cs/admin/groups/titles.php

@@ -2,12 +2,12 @@
 
 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',
+    'group_management' 	 	=> 'Správa skupin',
+    'create_group' 	 		=> 'Vytvořit novou skupinu',
+    'edit_group' 	 		=> 'Upravit skupinu',
+    'group_name' 	 		=> 'Název skupiny',
+    'group_admin' 	 		=> 'Správce skupiny',
+    'allow' 	 			=> 'Povolit',
+    'deny' 	 				=> 'Zakázat',
 
 );

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

@@ -2,33 +2,33 @@
 
 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',
+    'checkedout_to'		=> 'Vydané komu',
+    'checkout_to'		=> 'Vydat někomu',
+    'cost'				=> 'Pořizovací cena',
+    'create'			=> 'Vytvořit záznam majetku',
+    'date'				=> 'Datum pořízení',
+    'depreciates_on'	=> 'Odepisuje se',
+    'depreciation'		=> 'Amortizace',
+    'default_location'	=> 'Výchozí umístění',
+    'eol_date'			=> 'Konec životnosti',
+    'eol_rate'			=> 'Míra ukončení životnosti',
+    'expires'			=> 'Expiruje',
+    'fully_depreciated'	=> 'Plně odepsané',
+    'help_checkout'		=> 'Pokud si přejete přiřadit majetek okamžitě, měli by jste ze seznamu stavů zvolit "Připraveno k přiděleni", nebo se může něco pokazit. ',
+    'manufacturer'		=> 'Výrobce',
     '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',
+    'months'			=> 'měsíce',
+    'name'				=> 'Název majetku',
+    'notes'				=> 'Poznámky',
+    'order'				=> 'Č. objednávky',
+    'qr'				=> 'QR kód',
+    'requestable'		=> 'Uživatelé můžou požádat o tento majetek',
+    'serial'			=> 'Sériové číslo',
+    'status'			=> 'Stav',
+    'supplier'			=> 'Dodavatel',
+    'tag'				=> 'Označení majetku',
+    'update'			=> 'Úprava majetku',
+    'warranty'			=> 'Záruka',
+    'years'				=> 'roky',
 )
 ;

app/lang/cs/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'  					=> 'Majetek',
+    'checkin'  					=> 'Převzít majetek',
+    'checkout'  				=> 'Předat majetek uživateli',
+    'clone'  					=> 'Klonovat majetek',
+    'edit'  					=> 'Upravit majetek',
+    'pending'  					=> 'Nevyřízený majetek',
+    'view'  					=> 'Zobrazit majetek',
 );

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

@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Označení majetku',
     'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
-    'eol' 			=> 'EOL',
+    'book_value'  	=> 'Hodnota',
+    'change' 		=> 'Příjem/Výdej',
+    'checkout_date' => 'Datum vydání',
+    'checkoutto' 	=> 'Vydané',
+    'diff' 			=> 'Rozdíl',
+    'dl_csv' 		=> 'Stáhnout CSV',
+    'eol' 			=> 'Konec životnosti',
     'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
+    'location' 		=> 'Umístění',
+    'purchase_cost'	=> 'Cena',
+    'purchase_date'	=> 'Zakoupeno',
+    'serial'   		=> 'Sériové číslo',
+    'status'   		=> 'Stav',
+    'title'      	=> 'Majetek ',
 
 );

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

@@ -3,13 +3,13 @@
 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',
+    'city'   		=> 'Město',
+    'state'   		=> 'Stát',
+    'country'   	=> 'Země',
+    'create'		=> 'Vytvořit umístění',
+    'update'		=> 'Upravit umístění',
+    'name'			=> 'Název umístění',
+    'address'		=> 'Adresa',
+    'zip'			=> 'PSČ',
+    'locations'		=> 'Umístění',
 );

app/lang/cs/admin/manufacturers/table.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Výrobci',
+    'create'				=> 'Vytvořit výrobce',
     'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Název Výrobce',
+    'update'				=> 'Upravit Výrobce',
 
 );

app/lang/cs/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/cs/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',
-    '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.',
+    'name'      	=> 'Název stavu',
+    'title'      	=> 'Označení stavu',
+    'update'      	=> 'Upravit označení stavu',
+    'create'      	=> 'Vytvořit označení stavu',
+    'about'      	=> 'O označení stavu',
+    'info'      	=> 'Označení stavu se používá k popisu různých důvodů proč majetek <strong><em>nemůže</em></strong> být přidělen. Může být pokažený, pryč na opravě, na diagnostice, ztracený nebo ukradený, apod. Označení stavu umožňuje členům týmu zobrazovat postup.',
 );

app/lang/cs/button.php

@@ -2,10 +2,10 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'edit'    => 'Upravit',
+    'delete'  => 'Smazat',
+    'restore' => 'Obnovit',
+    'actions' => 'Akce',
+    'submit'  => 'Odeslat',
 
 );

app/lang/cs/general.php

@@ -2,93 +2,93 @@
 
 return array(
 
-    'address'				=> 'Address',
+    'address'				=> 'Adresa',
     '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',
+    'all_assets'			=> 'Všechna zařízení',
+    'all'       			=> 'Vše',
+    'asset_models'			=> 'Modely majetku',
+    'asset'					=> 'Zařízeni',
+    'asset_report'          => 'Report majetku',
+    'asset_tag'				=> 'Označení majetku',
+    'assets_available'		=> 'dostupných zařízení',
+    'assets'				=> 'Zařízení',
+    'avatar_delete'         => 'Smazat avatara',
+    'avatar_upload'         => 'Nahrát avatara',
+    'back'      			=> 'Zpět',
+    'cancel'  				=> 'Storno',
+    'categories'			=> 'Kategorie majetku',
+    'category'				=> 'Kategorie majetku',
+    'changeemail'  			=> 'Změnit e-mailovou adresu',
+    'changepassword'  		=> 'Změnit heslo',
+    'checkin'  				=> 'Příjem',
+    'checkout'  			=> 'Výdej',
+    'city'  				=> 'Město',
+    'country'  				=> 'Země',
+    'create'				=> 'Vytvořit nové',
+    'created_asset'			=> 'vytvořit majetek',
+    'created_at' 			=> 'Vytvořeno',
+    'currency'  			=> 'Kč',
+    'current'  				=> 'Aktuální',
+    'custom_report'         => 'Vlastní report majetku',
+    'date'					=> 'Datum',
+    'delete'  				=> 'Odstranit',
+    'deleted'  				=> 'Odstraněno',
+    'deployed'				=> 'Vydané',
+    'depreciation_report'	=> 'Report zastarání',
+    'depreciation'			=> 'Amortizace',
+    'editprofile'  			=> 'Upravit profil',
+    'eol'					=> 'Konec životnosti',
+    'first_name'			=> 'Jméno',
+    'generate'				=> 'Vytvořit',
+    'groups'				=> 'Skupiny',
+    'gravatar_email'        => 'Emailová adresa Gravatar',
+    'history_for'  			=> 'Historie uživatele',
     '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',
+    'image_delete'         => 'Smazat obrázek',
+    'image_upload'         => 'Nahrát obrázek',
+    'last_name'				=> 'Příjmení',
+    'license'				=> 'Licence',
+    'license_report'        => 'Report licencí',
+    'licenses_available'	=> 'dostupných licencí',
+    'licenses'				=> 'Licence',
+    'list_all'				=> 'Vypsat vše',
+    'location'              => 'Lokalita',
+    'locations'				=> 'Umístění',
+    'logout'				=> 'Odhlásit',
+    'manufacturer'			=> 'Výrobce',
+    'manufacturers'			=> 'Výrobci',
+    'model_no'				=> 'Modelové č.',
+    'months'				=> 'měsíce',
+    'moreinfo'				=> 'Další informace',
+    'name'					=> 'Název',
+    'no_depreciation'		=> 'Žádná amortizace',
+    'no_results'			=> 'Žádné výsledky.',
+    'no'  					=> 'Ne',
+    'notes'  				=> 'Poznámky',
+    'pending'				=> 'Čeká na vyřízení',
+    'people'				=> 'Lidé',
+    'per_page'				=> 'Výsledků na stránku',
+    'profile'				=> 'Váš profil',
+    'ready_to_deploy'		=> 'Připraveno k přidělení',
+    'reports'				=> 'Reporty',
+    'save'  				=> 'Uložit',
+    'settings'				=> 'Nastavení',
+    'sign_in'				=> 'Přihlásit se',
+    'site_name'				=> 'Název lokality',
+    'state'  				=> 'Stát',
+    'status_labels'			=> 'Označení stavu',
+    'status'    			=> 'Stav',
+    'suppliers'  			=> 'Dodavatelé',
+    'total_assets'			=> 'celkem zařízení',
+    'total_licenses'		=> 'celkem licencí',
+    'undeployable'			=> 'Ne-přiřaditelné',
+    'unknown_admin'			=> 'Neznámy správce',
+    'user'					=> 'Uživatel',
+    'viewassets'  			=> 'Zobrazit přiřazený majetek',
+    'website'               => 'Webová stránka',
+    'welcome'				=> 'Vítej, :name',
+    'years'					=> 'roky',
+    'yes' 					=> 'Ano',
+    'zip'  					=> 'PSČ',
 
 );

app/lang/cs/pagination.php

@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '« Previous',
+    'previous' => '« Předchozí',
 
-    'next'     => 'Next »',
+    'next'     => 'Další »',
 
 );

app/lang/cs/table.php

@@ -2,8 +2,8 @@
 
 return array(
 
-    'actions'	 	=> 'Actions',
-    'action' 		=> 'Action',
-    'by'      		=> 'By',
+    'actions'	 	=> 'Akce',
+    'action' 		=> 'Akce',
+    'by'      		=> 'Vytvořil',
 
 );

app/lang/da/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/de/admin/licenses/form.php

@@ -23,5 +23,5 @@ return array(
     'to_email'          => 'E-Mail des Lizenzerwerbers',
     'to_name'           => 'Name des Lizenzerwerbers',
     'update'            => 'Lizenz aktualisieren',
-    '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.'
+    'checkout_help'     => 'Du musst eine Lizenz an einen Gegenstand oder eine Person herausgeben. Du kannst beides auswählen, allerdings muss der Besitzer des Gegenstands mit der Person übereinstimmen an die du den Gegenstand herausgibst.'
 );

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

@@ -11,8 +11,8 @@ return array(
     'in_out'  					=> 'Zurücknehmen/Herausgeben',
     'info'  					=> 'Lizenzinfo',
     'license_seats'  			=> 'Lizenzaktivierungen',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
+    'seat'  					=> 'Lizenz',
+    'seats'  					=> 'Verfügbare Lizenzen',
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Nutzer',
     'view'  					=> 'Lizenz ansehen',

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

@@ -3,9 +3,9 @@
 return array(
 
     'does_not_exist' => 'Die Kategorie existiert nicht.',
-    '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.',
+    'user_does_not_exist' => 'Benutzer existiert nicht.',
+    'asset_does_not_exist' 	=> 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst existiert nicht.',
+    'owner_doesnt_match_asset' => 'Der Gegenstand den du mit dieser Lizenz verknüpfen willst gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Kategorie ist derzeit mindestens einem Modell zugeordnet und kann nicht gelöscht werden. Bitte aktualisieren Sie Ihre Modelle, um nicht mehr auf diese Kategorie zu verweisen und versuchen Sie es erneut.',
 
 

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

@@ -6,7 +6,7 @@ return array(
     'checkout'   		=> 'Zurücknehmen/Herausgeben',
     'id'      			=> 'ID',
     'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
+    'license_name'   	=> 'Lizenziert für',
     'purchase_date'   	=> 'Kaufdatum',
     'purchased'   		=> 'Gekauft',
     'seats'   			=> 'Anzahl Aktivierungen',

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

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Modell existiert nicht.',
-    '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. ',
+    'assoc_users'	 => 'Dieses Modell ist zur Zeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut das Modell zu löschen. ',
 
 
     'create' => array(

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

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset IDs',
+	'auto_increment_prefix'		=> 'Präfix (optional)',
+	'auti_incrementing_help'    => 'Aktiviere zuerst fortlaufende asset IDs um dies zu setzen',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
@@ -10,8 +13,8 @@ return array(
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
-    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
-    'qr_help'                   => 'Enable QR Codes first to set this',
+    'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
+    'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
     'qr_text'                   => 'QR Code Text',
     'setting'                   => 'Einstellung',
     'settings'                  => 'Einstellungen',

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

@@ -6,5 +6,5 @@ return array(
     '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.',
+    'info'      	=> 'Status Label werden benutzt um die diversen Gründe zu beschreiben warum ein Asset <strong><em>nicht</em></strong> ausgerollt werden kann. Es könnte kaputt sein, in der Diagnose, in der Reparatur, verloren oder gestohlen, etc. Status Label ermöglichen es deinem Team den Fortschritt anzuzeigen.',
 );

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

@@ -4,7 +4,7 @@ return array(
     'address'               => 'Lieferantenadressen',
     'assets'                => 'Assets',
     'city'                  => 'Stadt',
-    'contact'               => 'Contact Name',
+    'contact'               => 'Kontakt',
     'country'               => 'Land',
     'create'                => 'Lieferanten erstellen',
     'email'                 => 'Email',

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

@@ -16,8 +16,8 @@ return array(
         '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.',
+        'suspend'   => 'Der Benutzer wurde erfolgreich deaktiviert.',
+        'unsuspend' => 'Der Benutzer wurde erfolgreich reaktiviert.',
         'restored'  => 'Benutzer wurde erfolgreich wiederhergestellt.'
     ),
 
@@ -25,7 +25,7 @@ return array(
         '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.'
+        'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.'
     ),
 
 );

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

@@ -9,9 +9,9 @@ return array(
     'createuser' 			=> 'Benutzer erstellen',
     'deny'  				=> 'Ablehnen',
     'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
+    'employee_num'      	=> 'Mitarbeiternr.',
     '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.',
+    'groupnotes'			=> 'Wähle eine Gruppe um sie dem Benutzer zuzuweisen, denke daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe übernimmt.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Vererben',
     'job' 					=> 'Berufsbezeichnung',
@@ -26,7 +26,7 @@ return array(
     'title' 				=> 'Titel',
     'updateuser' 			=> 'Benutzer aktualisieren',
     'username' 				=> 'Benutzernamen',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'username_note' 		=> '(Dies wird für den Bind an das Active Directory benutzt, nicht für die Anmeldung.)',
     'cloneuser'                         => 'Benutzer kopieren',
     'viewusers' 			=> 'Benutzer anzeigen',
 );

app/lang/de/general.php

@@ -4,87 +4,87 @@ return array(
 
     'address'				=> 'Supplier Address',
     'admin'					=> 'Administrator',
-    'all_assets'			=> 'All Assets',
+    'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
-    'asset_models'			=> 'Asset Models',
+    'asset_models'			=> 'Asset Modelle',
     'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Report',
+    'asset_report'          => 'Asset Bericht',
     'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
+    'assets_available'		=> 'verfügbare Assets',
     'assets'				=> 'Assets',
     'avatar_delete'         => 'Avatar löschen',
     'avatar_upload'         => 'Avatar hochladen',
     'back'      			=> 'Zurück',
     'cancel'  				=> 'Abbrechen',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
+    'categories'			=> 'Asset Kategorien',
+    'category'				=> 'Asset Kategorie',
+    'changeemail'  			=> 'E-Mail Adresse ändern',
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Checkin Asset',
     'checkout'  			=> 'Checkout Asset to User',
     'city'  				=> 'Stadt',
     'country'  				=> 'Land',
     'create'				=> 'Create Location',
-    'created_asset'			=> 'created asset',
+    'created_asset'			=> 'Asset angelegt',
     'created_at' 			=> 'Erstellt am',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'custom_report'         => 'Custom Asset Report',
+    'currency'  			=> '€',
+    'current'  				=> 'Aktuell',
+    'custom_report'         => 'Spezieller Asset Report',
     'date'					=> 'Purchase Date',
     'delete'  				=> 'Löschen',
     'deleted'  				=> 'Gelöscht',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
+    'deployed'				=> 'Herausgegeben',
+    'depreciation_report'	=> 'Abschreibunsgreport',
+    'depreciation'			=> 'Abschreibung',
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
     'first_name'			=> 'Vorname',
-    'generate'				=> 'Generate',
+    'generate'				=> 'Generieren',
     'groups'				=> 'Gruppen',
-    'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_email'        => 'Gravatar E-Mail Adresse',
     'history_for'  			=> 'Verlauf für',
     'id'  					=> 'Id',
     'image_delete'         => 'Bild löschen',
     'image_upload'         => 'Bild hinzufügen',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
-    'license_report'        => 'License Report',
+    'license_report'        => 'Lizenz Report',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
+    'location'              => 'Standort',
+    'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',
     'manufacturer'			=> 'Hersteller',
     'manufacturers'			=> 'Hersteller',
-    'model_no'				=> 'Model No.',
+    'model_no'				=> 'Modellnr.',
     'months'				=> 'Monate',
-    'moreinfo'				=> 'More Info',
+    'moreinfo'				=> 'Mehr Informationen',
     'name'					=> 'Location Name',
     'no_depreciation'		=> 'Do Not Depreciate',
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
     'pending'				=> 'Pending Asset',
-    'people'				=> 'People',
+    'people'				=> 'Personen',
     'per_page'				=> 'Ergebnisse pro Seite',
     'profile'				=> 'Ihr Profil',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
+    'ready_to_deploy'		=> 'Fertig zum herausgeben',
+    'reports'				=> 'Berichte',
     'save'  				=> 'Speichern',
     'settings'				=> 'Einstellungen',
     'sign_in'				=> 'Einloggen',
-    'site_name'				=> 'Site Name',
-    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
+    'site_name'				=> 'Seitenname',
+    'state'  				=> 'Zustand',
+    'status_labels'			=> 'Statusbezeichnungen',
     'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'undeployable'			=> 'Un-deployable',
+    'suppliers'  			=> 'Lieferanten',
+    'total_assets'			=> 'Gesamte Assets',
+    'total_licenses'		=> 'Lizenzen insgesamt',
+    'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
     'user'					=> 'Nutzer',
-    'viewassets'  			=> 'View Assigned Assets',
+    'viewassets'  			=> 'Zugeordnete Assets anzeigen',
     'website'               => 'Webseite',
     'welcome'				=> 'Wilkommen, :name',
     'years'					=> 'Jahre',

app/lang/de/reminders.php

@@ -17,7 +17,7 @@ return array(
 
     "user"     => "Benutzername oder Email-Adresse sind falsch",
 
-    "token"    => "This password reset token is invalid.",
+    "token"    => "Das Token um das Passwort zurückzusetzen ist ungültig.",
 
     "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!",
 

app/lang/de/validation.php

@@ -13,56 +13,56 @@ 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 muss akzeptiert werden.",
+    "active_url"       => ":attribute ist keine gültige URL.",
+    "after"            => ":attribute muss ein Datum nach dem :date sein.",
+    "alpha"            => ":attribute darf nur aus Buchstaben bestehen.",
+    "alpha_dash"       => ":attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.",
+    "alpha_num"        => ":attribute darf nur aus Buchstaben und Zahlen bestehen.",
+    "before"           => ":attribute muss ein Datum vor dem :date sein.",
     "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 muss zwischen :min und :max liegen.",
+        "file"    => ":attribute darf nur zwischen :min und :max kilobytes groß sein.",
+        "string"  => ":attribute muss mindestens :min und maximal :max Zeichen enthalten.",
     ),
-    "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.",
+    "confirmed"        => ":attribute Bestätigung stimmt nicht überein.",
+    "date"             => ":attribute ist kein gültiges Datum.",
+    "date_format"      => ":attribute passt nicht zur :format Formatierung.",
+    "different"        => ":attribute und :other müssen sich unterscheiden.",
+    "digits"           => ":attribute muss :digits Stellen haben.",
+    "digits_between"   => ":attribute soll mindestens :min und darf maximal :max Stellen haben.",
+    "email"            => "Das Format von :attribute ist ungültig.",
+    "exists"           => "Das ausgewählte :attribute ist ungültig.",
+    "image"            => ":attribute muss ein Bild sein.",
+    "in"               => "Auswahl :attribute ist ungültig.",
+    "integer"          => ":attribute muss eine ganze Zahl sein.",
+    "ip"               => ":attribute muss eine gültige IP Adresse sein.",
     "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.",
+        "numeric" => ":attribute darf nicht größer als :max sein.",
+        "file"    => ":attribute darf nicht größer als :max Kilobyte sein.",
+        "string"  => ":attribute darf nicht mehr als :max Zeichen sein.",
     ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => ":attribute muss eine Datei des Typs :values sein.",
     "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.",
+        "numeric" => ":attribute muss kleiner als :min sein.",
+        "file"    => ":attribute muss mindestens :min Kilobyte groß sein.",
+        "string"  => ":attribute benötigt mindestens :min Zeichen.",
     ),
-    "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.",
+    "not_in"           => "Auswahl :attribute ist ungültig.",
+    "numeric"          => ":attribute muss eine Zahl sein.",
+    "regex"            => ":attribute Format ungültig.",
+    "required"         => ":attribute Feld muss ausgefüllt sein.",
+    "required_if"      => ":attribute wird benötigt wenn :other :value entspricht.",
+    "required_with"    => ":attribute wird benötigt wenn :value ausgewählt ist.",
+    "required_without" => ":attribute wird benötigt wenn :value nicht ausgewählt ist.",
+    "same"             => ":attribute und :other müssen übereinstimmen.",
     "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => ":attribute muss :size groß sein.",
+        "file"    => ":attribute muss :size Kilobyte groß sein.",
+        "string"  => ":attribute muss :size Zeichen haben.",
     ),
-    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "unique"           => ":attribute schon benutzt.",
+    "url"              => ":attribute Format ist ungültig.",
 
 
     /*
@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => ":attribute Feld darf nur Buchstaben, Kommas, Leerzeichen und Gedankenstriche enthalten.",
 
     /*
     |--------------------------------------------------------------------------

app/lang/en-GB/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/en-PT/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/en/admin/licenses/message.php

@@ -14,6 +14,18 @@ return array(
         'success' => 'License created successfully.'
     ),
 
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
     'update' => array(
         'error'   => 'License was not updated, please try again',
         'success' => 'License updated successfully.'

app/lang/en/button.php

@@ -2,10 +2,13 @@
 
 return array(
 
-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Actions',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Delete',
+    'edit'    	=> 'Edit',
+    'restore' 	=> 'Restore',
+    'submit'  	=> 'Submit',
+    'upload'    => 'Upload',
 
 );

app/lang/en/general.php

@@ -2,6 +2,7 @@
 
 return array(
 
+
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -39,6 +40,8 @@ return array(
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
     'groups'				=> 'Groups',
     'gravatar_email'        => 'Gravatar Email Address',

app/lang/es-ES/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generar IDs de equipo autoincrementales',
+	'auto_increment_prefix'		=> 'Prefijo (opcional)',
+	'auti_incrementing_help'    => 'Activa la generación automática de IDs de equipo antes de fijar esto',
     'display_asset_name'        => 'Mostrar Nombre Equipo',
     'display_checkout_date'     => 'Mostrar Fecha de Salida',
     'display_eol'               => 'Mostrar EOL',

app/lang/fi/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'        => 'Näytä laitteen nimi listauksessa',
     'display_checkout_date'     => 'Näytä luovutuspäivämäärä listauksessa',
     'display_eol'               => 'Näytä elinaika listauksessa',

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

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

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

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Générer des identifiants d\'actifs auto-incrémentés',
+	'auto_increment_prefix'		=> 'Préfixe (optionnel)',
+	'auti_incrementing_help'    => 'Activez les identifiants d\'actifs auto-incrémentés avant d\'activer ceci',
     'display_asset_name'        => 'Afficher le nom des actifs',
     'display_checkout_date'     => 'Afficher la date d\'association',
     'display_eol'               => 'Afficher la fin de vie dans les tables',

app/lang/hu/admin/groups/titles.php

@@ -3,11 +3,11 @@
 return array(
 
     'group_management' 	 	=> 'Group Management',
-    'create_group' 	 		=> 'Create New Group',
-    'edit_group' 	 		=> 'Edit Group',
-    'group_name' 	 		=> 'Group Name',
+    'create_group' 	 		=> 'Új csoport létrehozása',
+    'edit_group' 	 		=> 'Csoport szerkesztése',
+    'group_name' 	 		=> 'Csoport neve',
     'group_admin' 	 		=> 'Group Admin',
-    'allow' 	 			=> 'Allow',
-    'deny' 	 				=> 'Deny',
+    'allow' 	 			=> 'Engedélyezés',
+    'deny' 	 				=> 'Elutasítás',
 
 );

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

@@ -6,7 +6,7 @@ return array(
     'checkout_to'		=> 'Checkout to',
     'cost'				=> 'Purchase Cost',
     'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
+    'date'				=> 'Vásárlás dátuma',
     'depreciates_on'	=> 'Depreciates On',
     'depreciation'		=> 'Depreciation',
     'default_location'	=> 'Default Location',
@@ -16,7 +16,7 @@ return array(
     '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',
+    'model'				=> 'Modell',
     'months'			=> 'months',
     'name'				=> 'Asset Name',
     'notes'				=> 'Notes',
@@ -28,7 +28,7 @@ return array(
     'supplier'			=> 'Supplier',
     'tag'				=> 'Asset Tag',
     'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
+    'warranty'			=> 'Garancia',
     'years'				=> 'years',
 )
 ;

app/lang/hu/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/hu/admin/users/table.php

@@ -2,27 +2,27 @@
 
 return array(
 
-    'activated'  			=> 'Active',
-    'allow'  				=> 'Allow',
-    'checkedout'  			=> 'Assets',
+    'activated'  			=> 'Aktív',
+    'allow'  				=> 'Engedélyezés',
+    'checkedout'  			=> 'Eszközök',
     'created_at' 			=> 'Created',
-    'createuser' 			=> 'Create User',
-    'deny'  				=> 'Deny',
-    'email'      			=> 'Email',
+    'createuser' 			=> 'Felhasználó létrehozása',
+    'deny'  				=> 'Elutasítás',
+    'email'      			=> 'E-mail cím',
     'employee_num'      	=> 'Employee No.',
-    'first_name' 			=> 'First Name',
+    'first_name' 			=> 'Keresztnév',
     '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',
+    'last_name'  			=> 'Vezetéknév',
+    'location'  			=> 'Helyszín',
+    'manager' 				=> 'Felettes',
+    'name' 					=> 'Név',
+    'password_confirm' 		=> 'Jelszó megerősítése',
+    'password' 				=> 'Jelszó',
+    'phone'  				=> 'Telefon',
     'title' 				=> 'Title',
     'updateuser' 			=> 'Update User',
     'username' 				=> 'Username',

app/lang/hu/auth/message.php

@@ -3,18 +3,18 @@
 return array(
 
     'account_already_exists' => 'Már létezik ezzel az e-mail címmel felhasználó.',
-    'account_not_found'      => 'The email account or password is incorrect.',
+    'account_not_found'      => 'Téves e-mail cím vagy a jelszó.',
     'account_not_activated'  => 'Ez a felhasználó nincs aktiválva.',
-    'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
+    'account_suspended'      => 'Ez a felhasználói fiók fel van függesztve.',
+    'account_banned'         => 'Ez a felhasználó ki van tiltva.',
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'error'   => 'Bejelentkezés közben probléma lépett fel, kérjük próbálja újra.',
         'success' => 'Sikeresen bejelentkezett.',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'error'   => 'Felhasználói fiók létrehozása közben probléma lépett fel, kérjük próbálja újra.',
         'success' => 'Account sucessfully created.',
     ),
 

app/lang/it/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/ja/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' 			=> '資産カテゴリーについて',
+    'about_categories'  				=> '資産カテゴリーにより資産を分類します。カテゴリーの例としては &quot; デスクトップ &quot;、&quot; ラップトップ &quot; 、&quot； 携帯電話 &quot;、&quot; タブレット&quot; などがあります。資産カテゴリは任意に設定することができます。 ',
+    'asset_categories' 					=> '資産カテゴリー',
+    'category_name'  					=> 'カテゴリー名',
+    'create'  							=> 'カテゴリーの作成',
+    'update'  							=> 'カテゴリーの更新',
 
 );

app/lang/ja/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/ko/admin/depreciations/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_asset_depreciations'  			=> 'data:image/png;base64,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',
     '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',
+    'asset_depreciations'  					=> 'data:image/png;base64,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',
+    'create_depreciation'  					=> 'https://crowdin.com/translate/snipe-it/92/enus-ko#',
+    'depreciation_name'  					=> 'https://crowdin.com/translate/snipe-it/92/enus-ko#',
     'number_of_months'  					=> 'Number of Months',
     'update_depreciation'  					=> 'Update Depreciation',
 

app/lang/ko/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/ko/validation.php

@@ -13,7 +13,8 @@ return array(
     |
     */
 
-    "accepted"         => "The :attribute must be accepted.",
+    "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.",

app/lang/lol/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/ms/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'        => 'Papar Nama Harta',
     'display_checkout_date'     => 'Papar Tarikh \'Checkout\'',
     'display_eol'               => 'Papar EOL dalam paparan jadual',

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

@@ -2,24 +2,24 @@
 
 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. ',
+    'does_not_exist' => 'Afschrijvingsklasse bestaat niet.',
+    'assoc_users'	 => 'Deze afschrijving is momenteel gekoppeld aan één of meer modellen en kan niet verwijderd worden. Gelieve de modellen te verwijderen, en probeer het verwijderen opnieuw. ',
 
 
     'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'Afschrijvingsklasse werd niet aangemaakt, probeer opnieuw aub. :(',
+        'success' => 'Afschrijvingsklasse succesvol aangemaakt. :)'
     ),
 
     'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'Afschrijvingsklasse werd niet bijgewerkt. Probeer opnieuw, aub.',
+        'success' => 'Afschrijvingsklasse succesvol bijgewerkt.'
     ),
 
     '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.'
+        'confirm'   => 'Bent u zeker dat u deze afschrijvingsklasse wil verwijderen?',
+        'error'   => 'Er was een probleem bij het verwijderen van de afschrijvingsklasse. Probeer opnieuw, aub.',
+        'success' => 'De afschrijvingsklasse werd succesvol verwijderd.'
     )
 
 );

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

@@ -3,8 +3,8 @@
 return array(
 
     'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'months'   => 'Maanden',
+    'term'   => 'Termijn',
+    'title'      => 'Naam ',
 
 );

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

@@ -2,21 +2,21 @@
 
 return array(
 
-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Groep bestaat al!',
+    'group_not_found'     => 'Groep [:id] bestaat niet.',
+    'group_name_required' => 'Het veld \'naam\' is verplicht.',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Groep succesvol aangemaakt.',
+        'update' => 'Groep succesvol bijgewerkt.',
+        'delete' => 'Groep succesvol verwijderd.',
     ),
 
     '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.',
+        'confirm'   => 'Bent u zeker dat u deze groep wilt verwijderen?',
+        'create' => 'Er was een probleem tijdens het aanmaken van deze groep. Probeer opnieuw, aub.',
+        'update' => 'Er was een probleem tijdens het bijwerken van deze groep. Probeer opnieuw, aub.',
+        'delete' => 'Er was een probleem tijdens het verwijderen van deze groep. Probeer opnieuw, aub.',
     ),
 
 );

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

@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Naam',
+    'users'      => 'Aantal gebruikers',
 
 );

app/lang/nl/admin/groups/titles.php

@@ -2,12 +2,12 @@
 
 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',
+    'group_management' 	 	=> 'Groepsmanagement',
+    'create_group' 	 		=> 'Nieuwe groep aanmaken',
+    'edit_group' 	 		=> 'Groep bewerken',
+    'group_name' 	 		=> 'Groepsnaam',
+    'group_admin' 	 		=> 'Groepsbeheerder',
+    'allow' 	 			=> 'Toestaan',
+    'deny' 	 				=> 'Weigeren',
 
 );

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

@@ -2,33 +2,33 @@
 
 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',
+    'checkedout_to'		=> 'Uitgeleend aan',
+    'checkout_to'		=> 'Uitlenen aan',
+    'cost'				=> 'Aankoopprijs',
+    'create'			=> 'Materiaal aanmaken',
+    'date'				=> 'Aankoopdatum',
+    'depreciates_on'	=> 'Afschrijving op',
+    'depreciation'		=> 'Afschrijving',
+    'default_location'	=> 'Standaardlocatie',
+    'eol_date'			=> 'EOL datum',
+    'eol_rate'			=> 'Duur EOL',
+    'expires'			=> 'Vervalt op',
+    'fully_depreciated'	=> 'Volledig afgeschreven',
+    'help_checkout'		=> 'Als u dit materiaal onmiddellijk wil toekennen, dan moet u "Klaar Voor Gebruik" selecteren uit bovenstaande lijst met statussen, of er kunnen onverwachte dingen gebeuren. ',
+    'manufacturer'		=> 'Fabrikant',
     'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
+    'months'			=> 'maanden',
+    'name'				=> 'Materiaalnaam',
+    'notes'				=> 'Opmerkingen',
+    'order'				=> 'Ordernummer',
+    'qr'				=> 'QR-code',
+    'requestable'		=> 'Gebruikers mogen dit materiaal aanvragen',
+    'serial'			=> 'Serienummer',
     'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'supplier'			=> 'Leverancier',
+    'tag'				=> 'Materiaaltag',
+    'update'			=> 'Materiaalupdate',
+    'warranty'			=> 'Garantie',
+    'years'				=> 'jaar',
 )
 ;

app/lang/nl/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'  					=> 'Materiaal',
+    'checkin'  					=> 'Materiaal uitlenen',
+    'checkout'  				=> 'Leen materiaal uit aan deze gebruiker',
+    'clone'  					=> 'Kloon Materiaal',
+    'edit'  					=> 'Materiaal Bewerken',
+    'pending'  					=> 'Materiaal niet klaar voor gebruik',
+    'view'  					=> 'Bekijk Materiaal',
 );

app/lang/nl/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/nl/admin/users/table.php

@@ -2,31 +2,31 @@
 
 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.',
+    'activated'  			=> 'Actief',
+    'allow'  				=> 'Toestaan',
+    'checkedout'  			=> 'Materialen',
+    'created_at' 			=> 'Aangemaakt',
+    'createuser' 			=> 'Gebruiker aanmaken',
+    'deny'  				=> 'Weigeren',
+    'email'      			=> 'E-mail',
+    'employee_num'      	=> 'Werknemersnummer',
+    'first_name' 			=> 'Voornaam',
+    'groupnotes'			=> 'Selecteer een groep om toe te wijzen aan de gebruiker. Onthoud dat de gebruiker de rechten overneemt van de groep waaraan hij/zij wordt toegewezen.',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
-    'last_login'  			=> 'Last Login',
-    'last_name'  			=> 'Last Name',
-    'location'  			=> 'Location',
+    'inherit'  				=> 'Overnemen',
+    'job' 					=> 'Functie omschrijving',
+    'last_login'  			=> 'Laatst ingelogd',
+    'last_name'  			=> 'Achternaam',
+    'location'  			=> 'Locatie',
     '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',
+    'name' 					=> 'Naam',
+    'password_confirm' 		=> 'Bevestig uw wachtwoord',
+    'password' 				=> 'Wachtwoord',
+    'phone'  				=> 'Telefoon',
+    'title' 				=> 'Titel',
+    'updateuser' 			=> 'Gebruiker bijwerken',
+    'username' 				=> 'Gebruikersnaam',
+    'username_note' 		=> '(Dit wordt enkel gebruikt om te koppelen met de Active Directory, niet om aan te melden.)',
+    'cloneuser'                         => 'Gebruiker klonen',
+    'viewusers' 			=> 'Bekijk gebruikers',
 );

app/lang/nl/validation.php

@@ -30,39 +30,39 @@ return array(
     "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.",
-    "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.",
+    "digits_between"   => ":attribute moet tussen de :min en :max cijfers bevatten.",
+    "email"            => "Het formaat van :attribute is ongeldig.",
+    "exists"           => "Het geselecteerde kenmerk :attribute is ongeldig.",
+    "image"            => ":attribute moet een afbeelding zijn.",
+    "in"               => "Het geselecteerde kenmerk :attribute is ongeldig.",
+    "integer"          => ":attribute moet van het type integer zijn.",
+    "ip"               => ":attribute moet een geldig IP-adres zijn.",
     "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.",
+        "numeric" => ":attribute moet groter zijn dan :max.",
+        "file"    => ":attribute mag niet groter zijn dan :max kilobytes.",
+        "string"  => ":attribute mag niet langer zijn dan :max karakters.",
     ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => ":attribute moet een bestand zijn van het 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.",
+        "numeric" => ":attribute moet minimum :min zijn.",
+        "file"    => ":attribute moet minstens :min kilobytes groot zijn.",
+        "string"  => ":attribute moet tenminste :min karakters bevatten.",
     ),
-    "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.",
+    "not_in"           => "Het geselecteerde kenmerk :attribute is ongeldig.",
+    "numeric"          => ":attribute moet een getal zijn.",
+    "regex"            => "Het formaat van :attribute is ongeldig.",
+    "required"         => "Het veld :attribute is verplicht.",
+    "required_if"      => "het veld :attribute is verplicht als :other gelijk is aan :value.",
+    "required_with"    => "Het veld :attribute is verplicht als :values ingesteld staan.",
+    "required_without" => "Het veld :attribute is verplicht als :values niet ingesteld staan.",
+    "same"             => ":attribute en :other moeten gelijk zijn.",
     "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => ":attribute moet :size zijn.",
+        "file"    => ":attribute moet :size kilobytes groot zijn.",
+        "string"  => ":attribute moet :size karakters zijn.",
     ),
-    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "unique"           => "Het veld :attribute is reeds in gebruik.",
+    "url"              => "Het formaat van :attribute is ongeldig.",
 
 
     /*
@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => "Het veld :attribute mag enkel letters, cijfers, komma's, spaties of koppeltekens bevatten.",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -26,7 +26,7 @@ return array(
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
     'supplier'			=> 'Leverandør',
-    'tag'				=> 'Asset Tag',
+    'tag'				=> 'Eiendelsmerke',
     'update'			=> 'Oppdater eiendel',
     'warranty'			=> 'Garanti',
     'years'				=> 'år',

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

@@ -2,7 +2,7 @@
 
 return array(
 
-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Eiendelsmerke',
     'asset_model'       => 'Modell',
     'book_value'  	=> 'Verdi',
     'change' 		=> 'Inne/ute',

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

@@ -9,7 +9,7 @@ return array(
     'date'              => 'Innkjøpsdato',
     'depreciation'      => 'Avskrivning',
     'expiration'        => 'Utløpsdato',
-    'maintained'        => 'Maintained',
+    'maintained'        => 'Vedlikeholdt',
     'name'              => 'Navn programvare',
     'no_depreciation'   => 'Ingen avskrivning',
     'notes'             => 'Notater',
@@ -19,7 +19,7 @@ return array(
     'seats'             => 'Setelisenser',
     'serial'            => 'Serienummer',
     'supplier'          => 'Leverandør',
-    'termination_date'  => 'Termination Date',
+    'termination_date'  => 'Sluttdato',
     'to_email'          => 'Lisensiert til e-post',
     'to_name'           => 'Lisensiert til navn',
     'update'            => 'Oppdater lisens',

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

@@ -2,23 +2,23 @@
 
 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. ',
+    'does_not_exist' => 'Produsent eksisterer ikke.',
+    'assoc_users'	 => 'Denne produsenten er tilknyttet minst en modell og kan ikke slettes. Oppdatèr modellen(e) til ikke å bruke denne produsenten, og prøv igjen. ',
 
     'create' => array(
-        'error'   => 'Manufacturer was not created, please try again.',
-        'success' => 'Manufacturer created successfully.'
+        'error'   => 'Produsent ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av produsent vellykket.'
     ),
 
     'update' => array(
-        'error'   => 'Manufacturer was not updated, please try again',
-        'success' => 'Manufacturer updated successfully.'
+        'error'   => 'Produsent ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av produsent vellykket.'
     ),
 
     '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.'
+        'confirm'   => 'Er du sikker på at du vil slette denne produsenten?',
+        'error'   => 'Det oppstod et problem under sletting av produsenten. Prøv igjen.',
+        'success' => 'Sletting av produsenten var vellykket.'
     )
 
 );

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

@@ -2,10 +2,10 @@
 
 return array(
 
-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Eiendelsprodusenter',
+    'create'				=> 'Opprett produsent',
     'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Produsentnavn',
+    'update'				=> 'Endre produsent',
 
 );

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

@@ -2,24 +2,24 @@
 
 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. ',
+    'does_not_exist' => 'Modell eksisterer ikke.',
+    'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
 
 
     'create' => array(
-        'error'   => 'Model was not created, please try again.',
-        'success' => 'Model created successfully.'
+        'error'   => 'Modellen ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av modell var vellykket.'
     ),
 
     'update' => array(
-        'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'error'   => 'Modell ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av modell vellykket.'
     ),
 
     '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.'
+        'confirm'   => 'Er du sikker på at du vil slette denne modellen?',
+        'error'   => 'Det oppstod et problem under sletting av modellen. Prøv igjen.',
+        'success' => 'Sletting av modell vellykket.'
     )
 
 );

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

@@ -2,16 +2,16 @@
 
 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',
+    'create'				=> 'Opprett modell',
+    'created_at' 			=> 'Opprettet',
+    'eol'	 				=> 'Levetid',
+    'modelnumber'   		=> 'Modellnummer',
+    'name'      			=> 'Modellnavn',
+    'numassets' 			=> 'Eiendeler',
+    'title'					=> 'Modeller',
+    'update'				=> 'Endre modell',
+    'view'					=> 'Vis modell',
+    'update'				=> 'Endre modell',
+    'clone'				=> 'Klon modell',
+    'edit'				=> 'Endre modell',
 );

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

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'info'   => 'Select the options you want for your asset report.'
+    'info'   => 'Velg de alternativene du ønsker skal inngå i rapporten.'
 );

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

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'error'   => 'You must select at least ONE option.'
+    'error'   => 'Du må velge minst ETT alternativ.'
 );

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

@@ -1,22 +1,25 @@
 <?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',
+	'auto_increment_assets'		=> 'Generer automatisk økende eiendels-IDer',
+	'auto_increment_prefix'		=> 'Prefiks (valgfritt)',
+	'auti_incrementing_help'    => 'Aktiver automatisk øking av eiendels-IDer først for å velge dette alternativet',
+    'display_asset_name'        => 'Vis eiendelsnavn',
+    'display_checkout_date'     => 'Vis utsjekksdato',
+    'display_eol'               => 'Vis levetid i tabellvisning',
+    'display_qr'                => 'Vis QR-kode',
+    'info'                      => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
+    'laravel'                   => 'Laravel-versjon',
+    'per_page'                  => 'Resultater pr side',
+    'php'                       => 'PHP-versjon',
+    'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
+    'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
+    'qr_help'                   => 'Aktiver QR-koder først for å velge denne',
+    'qr_text'                   => 'Tekst QR-kode',
+    'setting'                   => 'Innstilling',
+    'settings'                  => 'Innstillinger',
+    'site_name'                 => 'Nettstedsnavn',
+    'system'                    => 'Systeminformasjon',
+    'update'                    => 'Oppdater innstillinger',
+    'value'                     => 'Verdi',
 );

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

@@ -4,8 +4,8 @@ return array(
 
 
     'update' => array(
-        'error'   => 'An error has occurred while updating. ',
-        'success' => 'Settings updated successfully.'
+        'error'   => 'En feil oppstod under oppdatering. ',
+        'success' => 'Oppdatering av innstillinger vellykket.'
     ),
 
 );

app/lang/no/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' => 'Lokasjon finnes ikke.',
+    'assoc_users'	 => 'Denne lokasjonen er tilknyttet minst en bruker og kan ikke slettes. Endre dine brukere til å ikke bruke denne 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' => 'Opprettelse av lokasjon vellykket.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Lokasjon ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av lokasjon vellykket.'
     ),
 
     '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'   => 'Er du sikker på at du vil slette dette statusmerket?',
+        'error'   => 'Det oppstod et problem under sletting av denne lokasjonen. Prøv igjen.',
+        'success' => 'Sletting av lokasjon vellykket.'
     )
 
 );

app/lang/no/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',
-    '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.',
+    'name'      	=> 'Statusnavn',
+    'title'      	=> 'Statusmerke',
+    'update'      	=> 'Oppdater statusmerke',
+    'create'      	=> 'Opprett statusmerke',
+    'about'      	=> 'Om statusmerker',
+    'info'      	=> 'Statusmerker brukes til å beskrive de forskjellige årsakene til hvorfor en eiendel  <strong><em>ikke</em></strong> skal utleveres. Eiendelen kan være ødelagt, til testing, til reparasjon, mistet eller stjålet, osv. Statusmerker lar teamet ditt vise fremdrift.',
 );

app/lang/no/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' => 'Leverandør finnes ikke.',
+    'assoc_users'	 => 'Denne leverandøren er tilknyttet minst en modell og kan ikke slettes. Oppdater modellene dine til ikke å bruke denne leverandøren og prøv igjen. ',
 
     'create' => array(
-        'error'   => 'Supplier was not created, please try again.',
-        'success' => 'Supplier created successfully.'
+        'error'   => 'Leverandør ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av leverandør vellykket.'
     ),
 
     'update' => array(
-        'error'   => 'Supplier was not updated, please try again',
-        'success' => 'Supplier updated successfully.'
+        'error'   => 'Leverandør ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av leverandør vellykket.'
     ),
 
     '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'   => 'Er du sikker på at du vil slette denne leverandøren?',
+        'error'   => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.',
+        'success' => 'Sletting av leverandør vellykket.'
     )
 
 );

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

@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'address'               => 'Supplier Address',
-    'assets'                => 'Assets',
-    'city'                  => 'City',
-    'contact'               => 'Contact Name',
-    'country'               => 'Country',
-    'create'                => 'Create Supplier',
-    'email'                 => 'Email',
-    'fax'                   => 'Fax',
+    'address'               => 'Leverandøradresse',
+    'assets'                => 'Eiendeler',
+    'city'                  => 'By',
+    'contact'               => 'Kontaktnavn',
+    'country'               => 'Land',
+    'create'                => 'Opprett leverandør',
+    'email'                 => 'E-post',
+    'fax'                   => 'Faks',
     'id'                    => 'ID',
-    'licenses'              => 'Licenses',
-    'name'                  => 'Supplier Name',
-    'notes'                 => 'Notes',
-    'phone'                 => 'Phone',
-    'state'                 => 'State',
-    'suppliers'             => 'Suppliers',
-    'update'                => 'Update Supplier',
+    'licenses'              => 'Lisenser',
+    'name'                  => 'Leverandørnavn',
+    'notes'                 => 'Notater',
+    'phone'                 => 'Telefon',
+    'state'                 => 'Stat',
+    'suppliers'             => 'Leverandører',
+    'update'                => 'Oppdater leverandør',
     'url'                   => 'URL',
-    'view'                  => 'View Supplier',
-    'view_assets_for'       => 'View Assets for',
-    'zip'                   => 'Postal Code',
+    'view'                  => 'Vis leverandør',
+    'view_assets_for'       => 'Vis eiendeler for',
+    'zip'                   => 'Postnummer',
 
 );

app/lang/no/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'  		=> 'Eiendeler tildelt :name',
+    'clone'  			=> 'Klon bruker',
+    'contact_user'  	=> 'Kontakt :navn',
+    'edit'  			=> 'Rediger bruker',
+    'history_user'  	=> 'Historikk for :name',
+    'last_login'  		=> 'Siste innlogging',
+    'software_user'  	=> 'Programvare utsjekket til :name',
+    'view_user'  		=> 'Vis bruker :name',
     );

app/lang/no/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'              	=> 'Bruker finnes allerede!',
+    'user_not_found'           	=> 'Bruker [:id] finnes ikke.',
+    'user_login_required'      	=> 'Login-feltet er påkrevd',
+    'user_password_required'   	=> 'Passord er påkrevd.',
+    'insufficient_permissions' 	=> 'Utilstrekkelige rettigheter.',
+    'user_deleted_warning' 		=> 'Denne brukeren er slettet. Du vil må gjenopprette denne brukeren for å redigere, eller tildele nye eiendeler.',
 
 
     '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'    => 'Opprettelse av bruker vellykket.',
+        'update'    => 'Oppdatering av bruker vellykket.',
+        'delete'    => 'Sletting av bruker vellykket.',
+        'ban'       => 'Vellykket forbud av bruker.',
+        'unban'     => 'Forbud av bruker ble opphevet.',
+        'suspend'   => 'Vellykket deaktivering av bruker.',
+        'unsuspend' => 'Vellykket aktivering av bruker.',
+        'restored'  => 'Vellykket gjenopprettelse av bruker.'
     ),
 
     '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' => 'Det oppstod et problem under opprettelse av bruker. Prøv igjen.',
+        'update' => 'Det oppstod et problem under oppdatering av bruker. Prøv igjen.',
+        'delete' => 'Det oppstod et problem under sletting av bruker. Prøv igjen.',
+        'unsuspend' => 'Det oppstod et problem under aktivering av bruker. Prøv igjen.'
     ),
 
 );

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

@@ -2,31 +2,31 @@
 
 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.',
+    'activated'  			=> 'Aktiv',
+    'allow'  				=> 'Tillatt',
+    'checkedout'  			=> 'Eiendeler',
+    'created_at' 			=> 'Opprettet',
+    'createuser' 			=> 'Opprett bruker',
+    'deny'  				=> 'Nekt',
+    'email'      			=> 'E-post',
+    'employee_num'      	=> 'Ansattnummer',
+    'first_name' 			=> 'Fornavn',
+    'groupnotes'			=> 'Velg en gruppe for brukeren. Husk at brukeren får samme rettigheter som gruppen han tildeles.',
     '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',
+    'inherit'  				=> 'Arv',
+    'job' 					=> 'Jobbtittel',
+    'last_login'  			=> 'Siste innlogging',
+    'last_name'  			=> 'Etternavn',
+    'location'  			=> 'Lokasjon',
+    'manager' 				=> 'Overordnet',
+    'name' 					=> 'Navn',
+    'password_confirm' 		=> 'Bekreft passord',
+    'password' 				=> 'Passord',
+    'phone'  				=> 'Telefon',
+    'title' 				=> 'Tittel',
+    'updateuser' 			=> 'Oppdater bruker',
+    'username' 				=> 'Brukernavn',
+    'username_note' 		=> '(Dette brukes til binding i Active Directory, ikke for innlogging)',
+    'cloneuser'                         => 'Klon bruker',
+    'viewusers' 			=> 'Vis brukere',
 );

app/lang/no/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' => 'En konto med denne e-postadressen finnes allerede.',
+    'account_not_found'      => 'E-postkontoen eller passordet er feil.',
+    'account_not_activated'  => 'Denne brukerkontoen er ikke aktiv.',
+    'account_suspended'      => 'Denne brukerkontoen er deaktivert.',
+    'account_banned'         => 'Denne brukerkontoen er forbudt.',
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'Det oppstod et problem under innlogging. Prøv igjen.',
+        'success' => 'Vellykket innlogging.',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'Det oppstod et problem under opprettelse av konto. Prøv igjen.',
+        'success' => 'Opprettelse av konto vellykket.',
     ),
 
         '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'   => 'Det oppstod et problem under henting av kode for resetting av passord. Prøv igjen.',
+            'success' => 'E-post for resetting av passord sendt.',
         ),
 
         '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'   => 'Det oppstod et problem under gjenopprettelse av passordet ditt. Prøv igjen.',
+            'success' => 'Ditt passord er resatt.',
         ),
 
     'activate' => array(
-        'error'   => 'There was a problem while trying to activate your account, please try again.',
-        'success' => 'Your account has been successfully activated.',
+        'error'   => 'Det oppstod et problem under aktivering av kontoen din. Prøv igjen.',
+        'success' => 'Din konto er aktivert.',
     ),
 
 );