Merge remote-tracking branch 'origin/develop'

This reverts commit ca625418fe.

Dockerfile

@@ -33,12 +33,10 @@ RUN a2enmod rewrite
 
 ############ INITIAL APPLICATION SETUP #####################
 
-COPY docker/app_start.patch /tmp/app_start.patch
-
 WORKDIR /var/www/html
 
-#Patch bootstrap file
-RUN patch -p1 < /tmp/app_start.patch
+#Append to bootstrap file (less brittle than 'patch')
+RUN sed -i 's/return $app;/$env="production";\nreturn $app;/' bootstrap/start.php
 
 #copy all configuration files
 COPY docker/*.php /var/www/html/app/config/production/

README.md

@@ -9,7 +9,7 @@ This is a FOSS project for asset management in IT Operations. Knowing who has wh
 
 It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
 
-This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo/).)
+This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
 __This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.
 

app/commands/AssetImportCommand.php

@@ -77,66 +77,80 @@ class AssetImportCommand extends Command {
 				$user_email = '';
 			}
 
-			// Asset Category
+			// User's email
 			if (array_key_exists('2',$row)) {
-				$user_asset_category = trim($row[2]);
+				$user_username = trim($row[2]);
+			} else {
+				$user_username = '';
+			}
+
+			// Asset Name
+			if (array_key_exists('3',$row)) {
+				$user_asset_asset_name = trim($row[3]);
+			} else {
+				$user_asset_asset_name = '';
+			}
+
+			// Asset Category
+			if (array_key_exists('4',$row)) {
+				$user_asset_category = trim($row[4]);
 			} else {
 				$user_asset_category = '';
 			}
 
 			// Asset Name
-			if (array_key_exists('3',$row)) {
-				$user_asset_name = trim($row[3]);
+			if (array_key_exists('5',$row)) {
+				$user_asset_name = trim($row[5]);
 			} else {
 				$user_asset_name = '';
 			}
 
 			// Asset Manufacturer
-			if (array_key_exists('4',$row)) {
-				$user_asset_mfgr = trim($row[4]);
+			if (array_key_exists('6',$row)) {
+				$user_asset_mfgr = trim($row[6]);
 			} else {
 				$user_asset_mfgr = '';
 			}
 
 			// Asset model number
-			if (array_key_exists('5',$row)) {
-				$user_asset_modelno = trim($row[5]);
+			if (array_key_exists('7',$row)) {
+				$user_asset_modelno = trim($row[7]);
 			} else {
 				$user_asset_modelno = '';
 			}
 
 			// Asset serial number
-			if (array_key_exists('6',$row)) {
-				$user_asset_serial = trim($row[6]);
+			if (array_key_exists('8',$row)) {
+				$user_asset_serial = trim($row[8]);
 			} else {
 				$user_asset_serial = '';
 			}
 
 			// Asset tag
-			if (array_key_exists('7',$row)) {
-				$user_asset_tag = trim($row[7]);
+			if (array_key_exists('9',$row)) {
+				$user_asset_tag = trim($row[9]);
 			} else {
 				$user_asset_tag = '';
 			}
 
 			// Asset location
-			if (array_key_exists('8',$row)) {
-				$user_asset_location = trim($row[8]);
+			if (array_key_exists('10',$row)) {
+				$user_asset_location = trim($row[10]);
 			} else {
 				$user_asset_location = '';
 			}
 
 			// Asset notes
-			if (array_key_exists('9',$row)) {
-				$user_asset_notes = trim($row[9]);
+			if (array_key_exists('11',$row)) {
+				$user_asset_notes = trim($row[11]);
 			} else {
 				$user_asset_notes = '';
 			}
 
 			// Asset purchase date
-			if (array_key_exists('10',$row)) {
-				if ($row[10]!='') {
-					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[10]));
+			if (array_key_exists('12',$row)) {
+				if ($row[12]!='') {
+					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[12]));
 				} else {
 					$user_asset_purchase_date = '';
 				}
@@ -145,9 +159,9 @@ class AssetImportCommand extends Command {
 			}
 
 			// Asset purchase cost
-			if (array_key_exists('11',$row)) {
-				if ($row[11]!='') {
-					$user_asset_purchase_cost = trim($row[11]);
+			if (array_key_exists('13',$row)) {
+				if ($row[13]!='') {
+					$user_asset_purchase_cost = trim($row[13]);
 				} else {
 					$user_asset_purchase_cost = '';
 				}
@@ -168,46 +182,24 @@ class AssetImportCommand extends Command {
 				$user_username = '';
 
 			} else {
+				$user_email_array = User::generateFormattedNameFromFullName($this->option('email_format'), $user_name);
+				$first_name = $user_email_array['first_name'];
+				$last_name = $user_email_array['last_name'];
 
-					$name = explode(" ", $user_name);
-					$first_name = $name[0];
-					$email_last_name = '';
-					$email_prefix = $first_name;
+				if ($user_email=='') {
+					$user_email = $user_email_array['username'].'@'.Config::get('app.domain');
+				}
 
-					if (!array_key_exists(1, $name)) {
-						$last_name='';
-						$email_last_name = $last_name;
-						$email_prefix = $first_name;
+				if ($user_username=='') {
+					if ($this->option('username_format')=='email') {
+						$user_username = $user_email;
 					} else {
-						$last_name = str_replace($first_name,'',$user_name);
-
-						if ($this->option('email_format')=='filastname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name[0].$email_last_name;
-
-						} elseif ($this->option('email_format')=='firstname.lastname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name.'.'.$email_last_name;
-
-						} elseif ($this->option('email_format')=='firstname') {
-							$email_last_name.=str_replace(' ','',$last_name);
-							$email_prefix = $first_name;
-						}
-
-
+						$user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
+						$user_username = $user_name_array['username'];
 					}
 
+				}
 
-					$user_username = $email_prefix;
-
-					// Generate an email based on their name if no email address is given
-					if ($user_email=='') {
-						if ($first_name=='Unknown') {
-							$status_id = 7;
-						}
-						$email = strtolower($email_prefix).'@'.$this->option('domain');
-						$user_email = str_replace("'",'',$email);
-					}
 			}
 
 			$this->comment('Full Name: '.$user_name);
@@ -229,7 +221,8 @@ class AssetImportCommand extends Command {
 			$this->comment('------------- Action Summary ----------------');
 
 			if ($user_username!='') {
-				if ($user = User::where('username', $user_username)->whereNotNull('username')->first()) {
+				if ($user = User::MatchEmailOrUsername($user_username, $user_email)
+					->whereNotNull('username')->first()) {
 					$this->comment('User '.$user_username.' already exists');
 				} else {
 					// Create the user
@@ -238,7 +231,7 @@ class AssetImportCommand extends Command {
 						'last_name' => $last_name,
 						'email'     => $user_email,
 						'username'     => $user_username,
-						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
+						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 12),
 						'activated' => true,
 						'permissions' => array(
 							'admin' => 0,
@@ -262,24 +255,30 @@ class AssetImportCommand extends Command {
 			if ($location = Location::where('name', $user_asset_location)->first()) {
 				$this->comment('Location '.$user_asset_location.' already exists');
 			} else {
-				$location = new Location();
-				$location->name = e($user_asset_location);
-				$location->address = '';
-				$location->city = '';
-				$location->state = '';
-				$location->country = '';
-				$location->user_id = 1;
 
-				if (!$this->option('testrun')=='true') {
+				if ($user_asset_location!='') {
 
-					if ($location->save()) {
-						$this->comment('Location '.$user_asset_location.' was created');
-		            } else {
-						$this->comment('Something went wrong! Location '.$user_asset_location.' was NOT created');
+					$location = new Location();
+					$location->name = e($user_asset_location);
+					$location->address = '';
+					$location->city = '';
+					$location->state = '';
+					$location->country = '';
+					$location->user_id = 1;
+
+					if (!$this->option('testrun')=='true') {
+
+						if ($location->save()) {
+							$this->comment('Location '.$user_asset_location.' was created');
+			            } else {
+							$this->comment('Something went wrong! Location '.$user_asset_location.' was NOT created');
+						}
+
+					} else {
+						$this->comment('Location '.$user_asset_location.' was (not) created - test run only');
 					}
-
 				} else {
-					$this->comment('Location '.$user_asset_location.' was (not) created - test run only');
+					$this->comment('No location given, so none created.');
 				}
 
 			}
@@ -339,7 +338,7 @@ class AssetImportCommand extends Command {
 			// Check for the asset match and create it if it doesn't exist
 
 				$asset = new Asset();
-				$asset->name = e($user_asset_name);
+				$asset->name = e($user_asset_asset_name);
 				if ($user_asset_purchase_date!='') {
 					$asset->purchase_date = $user_asset_purchase_date;
 				} else {
@@ -400,11 +399,11 @@ class AssetImportCommand extends Command {
 	 */
 	protected function getOptions()
 	{
-		return array(
-			array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
-			array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
-			array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
-		);
+	return array(
+		array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
+		array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
+		array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
+	);
 	}
 
 

app/config/local/app.example.php

@@ -28,6 +28,19 @@ return array(
 
     'url' => 'http://snipe-it-laravel.local:8888',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -37,7 +50,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 to create a random one
+    | Run a php artisan key:generate --env=staging to create a random one
     */
 
     'key' => 'Change_this_key_or_snipe_will_get_ya',

app/config/production/app.example.php

@@ -28,6 +28,19 @@ return array(
 
     'url' => 'https://production.yourserver.com',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

app/config/staging/app.example.php

@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    'debug' => true,
+    'debug' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -28,6 +28,19 @@ return array(
 
     'url' => 'http://staging.yourserver.com',
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Organization Domain Name
+    |--------------------------------------------------------------------------
+    |
+    | The domain name of the organization, used when generating email addresses
+    | through the import tools.
+    |
+    */
+
+    'domain' => 'yourserver.com',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-125',
-  'hash_version' => 'v2.0-125-g9b04954',
+  'app_version' => 'v2.0-175',
+  'hash_version' => 'v2.0-175-gd0aab3e',
 );

app/controllers/admin/AccessoriesController.php

@@ -432,7 +432,7 @@ class AccessoriesController extends AdminController
 
 
             $log = $logaction->logaction('checkin from');
-            
+
             if(!is_null($accessory_user->assigned_to)) {
                 $user = User::find($accessory_user->assigned_to);
             }
@@ -465,7 +465,7 @@ class AccessoriesController extends AdminController
 
     public function getDatatable()
     {
-        $accessories = Accessory::select(array('id','name','qty'))
+        $accessories = Accessory::with('category')
         ->whereNull('deleted_at')
         ->orderBy('created_at', 'DESC');
 
@@ -477,6 +477,10 @@ class AccessoriesController extends AdminController
             });
 
         return Datatable::collection($accessories)
+        ->addColumn('category',function($accessories)
+            {
+                return $accessories->category->name;
+            })
         ->addColumn('name',function($accessories)
             {
                 return link_to('admin/accessories/'.$accessories->id.'/view', $accessories->name);
@@ -490,8 +494,8 @@ class AccessoriesController extends AdminController
                 return $accessories->numRemaining();
             })
         ->addColumn($actions)
-        ->searchColumns('name','qty','numRemaining','actions')
-        ->orderColumns('name','qty','numRemaining','actions')
+        ->searchColumns('category','name','qty','numRemaining','actions')
+        ->orderColumns('category','name','qty','numRemaining','actions')
         ->make();
     }
 

app/controllers/admin/AssetsController.php

@@ -27,6 +27,9 @@ use Datatable;
 use TCPDF;
 use Slack;
 use Manufacturer; //for embedded-create
+use Artisan;
+use Symfony\Component\Console\Output\BufferedOutput;
+
 
 class AssetsController extends AdminController
 {
@@ -619,6 +622,102 @@ class AssetsController extends AdminController
 
     }
 
+
+    public function getImportUpload() {
+
+        $path = app_path().'/private_uploads/imports/assets';
+        $files = array();
+
+        if ($handle = opendir($path)) {
+
+            /* This is the correct way to loop over the directory. */
+            while (false !== ($entry = readdir($handle))) {
+                clearstatcache();
+                if (substr(strrchr($entry,'.'),1)=='csv') {
+                    $files[] = array(
+                            'filename' => $entry,
+                            'filesize' => Setting::fileSizeConvert(filesize($path.'/'.$entry)),
+                            'modified' => filemtime($path.'/'.$entry)
+                        );
+                }
+
+            }
+            closedir($handle);
+            $files = array_reverse($files);
+        }
+
+        return View::make('backend/hardware/import')->with('files',$files);
+    }
+
+
+
+    public function postAPIImportUpload() {
+
+        if (!Config::get('app.lock_passwords')) {
+
+            $rules = array(
+                'files' => 'required'
+            );
+
+            $validator = Validator::make(Input::all(), $rules);
+
+            if ($validator->fails()) {
+                $messages = $validator->messages();
+                $results['error']=$messages->first('files');
+                return $results;
+
+            } else {
+                    $files = Input::file('files');
+                    $path = app_path().'/private_uploads/imports/assets';
+                    $results = array();
+
+                    foreach ($files as $file) {
+
+                        if (!in_array($file->getMimeType(), array(
+                            'application/vnd.ms-excel',
+                            'text/csv',
+                            'text/plain',
+                            'text/comma-separated-values',
+                            'text/tsv'))) {
+                            $results['error']='File type must be CSV';
+                            return $results;
+                        }
+
+                        $fixed_filename = str_replace(' ','-',$file->getClientOriginalName());
+                        $file->move($path, date('Y-m-d-his').'-'.$file->getClientOriginalName());
+                        $name = date('Y-m-d-his').'-'.$fixed_filename;
+                        $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
+                        $results[] = compact('name', 'filesize');
+                    }
+            }
+
+        } else {
+
+            $results['error']=Lang::get('general.feature_disabled');
+            return $results;
+        }
+
+        return array(
+            'files' => $results
+        );
+
+
+    }
+
+    public function getProcessImportFile($filename) {
+        // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
+
+        $output = new BufferedOutput;
+        Artisan::call('asset-import:csv', ['filename'=> app_path().'/private_uploads/imports/assets/'.$filename, '--email_format'=>'firstname.lastname', '--username_format'=>'firstname.lastname'], $output);
+        $display_output =  $output->fetch();
+        $file = app_path().'/private_uploads/imports/assets/'.str_replace('.csv','',$filename).'-output-'.date("Y-m-d-his").'.txt';
+        file_put_contents($file, $display_output);
+
+
+        return View::make('backend/hardware/import-status');
+
+    }
+
     /**
      * Asset clone.
      *

app/controllers/admin/ConsumablesController.php

@@ -164,21 +164,11 @@ class ConsumablesController extends AdminController
             return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
         }
 
-
-		if ($consumable->hasUsers() > 0) {
-			 return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.assoc_users', array('count'=> $consumable->hasUsers())));
-		} else {
 			$consumable->delete();
 
             // Redirect to the locations management page
             return Redirect::to('admin/consumables')->with('success', Lang::get('admin/consumables/message.delete.success'));
 
-		}
-
-
-
-
-
     }
 
 

app/controllers/admin/LicensesController.php

@@ -900,6 +900,12 @@ class LicensesController extends AdminController
         ->addColumn('serial', function($licenses) {
             return link_to('/admin/licenses/'.$licenses->id.'/view', mb_strimwidth($licenses->serial, 0, 50, "..."));
         })
+        ->addColumn('license_name', function($licenses) {
+            return $licenses->license_name;
+        })
+        ->addColumn('license_email', function($licenses) {
+            return $licenses->license_email;
+        })
         ->addColumn('totalSeats', function($licenses) {
             return $licenses->totalSeatsByLicenseID();
         })
@@ -913,8 +919,8 @@ class LicensesController extends AdminController
             return $licenses->notes;
         })
         ->addColumn($actions)
-        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
-        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
+        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes','license_name','license_email')
+        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes','license_name','license_email')
         ->make();
     }
 

app/controllers/admin/UsersController.php

@@ -530,7 +530,7 @@ class UsersController extends AdminController {
                     $update_assets = Asset::whereIn('id', $asset_array)->update(
                             array(
                                 'status_id' => e(Input::get('status_id')),
-                                'assigned_to' => '',
+                                'assigned_to' => null,
                     ));
                 }
 
@@ -545,9 +545,9 @@ class UsersController extends AdminController {
                     $logaction->note = 'Bulk checkin';
                     $log = $logaction->logaction('checkin from');
 
-                    $update_assets = DB::table('accessories_users')->whereIn('id', $accessory_array)->update(
+                    $update_accessories = DB::table('accessories_users')->whereIn('id', $accessory_array)->update(
                             array(
-                                'assigned_to' => '',
+                                'assigned_to' => null,
                     ));
                 }
 

app/database/migrations/2015_09_28_003314_fix_default_purchase_order.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixDefaultPurchaseOrder extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255) DEFAULT NULL;');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE `'.DB::getTablePrefix().'licenses` MODIFY `purchase_order` varchar(255);');
+	}
+
+}

app/database/seeds/ActionlogSeeder.php

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

app/database/seeds/AssetMaintenancesSeeder.php

@@ -18,6 +18,7 @@ class AssetMaintenancesSeeder extends Seeder
             'title'      	=> 'Test Maintenance',
             'start_date' 	=> $date->modify('-10 day'),
             'cost'  => '200.99',
+            'is_warranty'  => '0',
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
         );

app/database/seeds/SuppliersSeeder.php

@@ -15,12 +15,14 @@ class SuppliersSeeder extends Seeder
             'name'      	=> 'New Egg',
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
+            'user_id'       => 1,
         );
 
         $supplier[] = array(
             'name'      	=> 'Microsoft',
             'created_at' 	=> $date->modify('-10 day'),
             'updated_at' 	=> $date->modify('-3 day'),
+            'user_id'       => 1,
         );
 
 

app/lang/ar/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/bg/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Сигурни ли сте, че желаете да изтриете аксесоара?',
+        'confirm'   => 'Желаете ли изтриване на консуматива?',
         'error'   => 'Проблем при изтриването на консуматива. Моля опитайте отново.',
-        'success' => 'Аксесоарът беше изтрит успешно.'
+        'success' => 'Консумативът изтрит успешно.'
     ),
 
      'checkout' => array(

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

@@ -22,7 +22,7 @@ return array(
     'eula_settings'				=> 'Настройки на EULA',
     'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'Общи настройки',
-	'generate_backup'			=> 'Generate Backup',
+	'generate_backup'			=> 'Създаване на архив',
     'header_color'              => 'Цвят на хедъра',
     'info'                      => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
     'laravel'                   => 'Версия на Laravel',

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

@@ -19,24 +19,24 @@ return array(
         'delete'    => 'Потребителят е изтрит.',
         'ban'       => 'Потребителят беше забранен успешно.',
         'unban'     => 'Потребителят възстановен успешно.',
-        'suspend'   => 'User was successfully suspended.',
-        'unsuspend' => 'User was successfully unsuspended.',
+        'suspend'   => 'Потребителят бе временно спрян.',
+        'unsuspend' => 'Потребителят активиран успешно.',
         'restored'  => 'Потребителят е възстановен.',
-        'import'    => 'Users imported successfully.',
+        'import'    => 'Потребителите заредени успешно.',
     ),
 
     'error' => array(
         'create' => 'Възникна проблем при създаването на този потребител. Моля, опитайте отново.',
         'update' => 'Възникна проблем при обновяването на този потребител. Моля, опитайте отново.',
         'delete' => 'Възникна проблем при изтриването на този потребител. Моля, опитайте отново.',
-        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
-        'import'    => 'There was an issue importing users. Please try again.',
+        'unsuspend' => 'Проблем при активирането на потребителя. Моля опитайте отново.',
+        'import'    => 'Проблем при зареждането на потребителите. Моля опитайте отново.',
         'asset_already_accepted' => 'Този актив е вече приет.',
         'accept_or_decline' => 'Трябва да приемете или да откажете този актив.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Проблем при комуникацията с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_bind' => 'Проблем при връзката с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
+        'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра:',
     ),
 
     'deletefile' => array(
@@ -45,10 +45,10 @@ return array(
     ),
 
     '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.',
+        'error'   => 'Проблем при качването на файл/овете. Моля опитайте отново.',
+        'success' => 'Файл/овете качени успешно.',
+        'nofiles' => 'Не сте избрали файлове за качване',
+        'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.',
     ),
 
 );

app/lang/bg/general.php

@@ -90,53 +90,53 @@
     'no'  					=> 'Не',
     'notes'  				=> 'Бележки',
     'page_menu'				=> 'Показване на _MENU_ записа',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
+    'pagination_info'		=> 'Показване на _START_ до _END_ от _TOTAL_ елемента',
+    'pending'				=> 'Изчакване',
+    'people'				=> 'Потребители',
+    'per_page'				=> 'Резултати на страница',
     'previous'				=> 'Предишен',
-    'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
+    'processing'			=> 'Обработка',
+    'profile'				=> 'Вашият профил',
     'qty'		            => 'Количество',
     'quanitity'		        => 'Количество',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'recent_activity'		=> 'Recent Activity',
-    'reports'				=> 'Reports',
-    'requested'				=> 'Requested',
+    'ready_to_deploy'		=> 'Готово за предоставяне',
+    'recent_activity'		=> 'Последни действия',
+    'reports'				=> 'Справки',
+    'requested'				=> 'Изискан',
     'save'  				=> 'Запис',
-    'select'				=> 'Select',
+    'select'				=> 'Избор',
     'search'				=> 'Търсене',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
-    'select_statuslabel'	=> 'Select Status',
-    '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',
-    'type'  				=> 'Type',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'update'                => 'Update',
-    'uploaded'              => 'Uploaded',
-    'user'					=> 'User',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
-    'users'                 => 'Users',
-    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'select_depreciation'	=> 'Избор на вид амортизация',
+    'select_location'		=> 'Избор на местоположение',
+    'select_manufacturer'	=> 'Избор на производител',
+    'select_model'			=> 'Избор на модел',
+    'select_supplier'		=> 'Избор на доставчик',
+    'select_user'			=> 'Избор на потребител',
+    'select_date'			=> 'Избор на дата',
+    'select_statuslabel'	=> 'Избор на статус',
+    'settings'				=> 'Настройки',
+    'sign_in'				=> 'Вход',
+    'site_name'				=> 'Име на системата',
+    'state'  				=> 'Област',
+    'status_labels'			=> 'Статус етикети',
+    'status'    			=> 'Статус',
+    'suppliers'  			=> 'Доставчици',
+    'total_assets'			=> 'общо активи',
+    'total_licenses'		=> 'общо лицензи',
+    'type'  				=> 'Тип',
+    'undeployable'			=> 'Не може да бъде предоставян',
+    'unknown_admin'			=> 'Непознат администратор',
+    'update'                => 'Обновяване',
+    'uploaded'              => 'Качен',
+    'user'					=> 'Потребител',
+    'accepted'			    => 'приет',
+    'declined'			    => 'отказан',
+    'unaccepted_asset_report' => 'Неприети активи',
+    'users'                 => 'Потребители',
+    'viewassets'  			=> 'Преглед на изписаните активи',
+    'website'               => 'Страница',
+    'welcome'				=> 'Добре дошли, :name',
+    'years'					=> 'години',
+    'yes' 					=> 'Да',
+    'zip'  					=> 'Пощенски код',
     ];

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/da/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Wollen Sie dieses Zubehör wirklich löschen?',
+        'confirm'   => 'Sind Sie sicher, dass Sie dieses Verbrauchsmaterial löschen möchten?',
         'error'   => 'Es gab Probleme das Verbrauchsmaterial zu löschen. Bitte versuchen Sie es noch einmal.',
-        'success' => 'Zubehör wurde erfolgreich gelöscht.'
+        'success' => 'Verbrauchsmaterial erfolgreich gelöscht.'
     ),
 
      'checkout' => array(

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/en-ID/admin/accessories/general.php

@@ -1,20 +1,20 @@
 <?php
 
 return array(
-    'about_accessories_title' 			=> 'About Accessories',
-    'about_accessories_text'  			=> 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
-    'accessory_category' 				=> 'Accessory Category',
-    'accessory_name'  					=> 'Accessory Name',
-    'create'  							=> 'Create Accessory',
-    'eula_text'							=> 'Category EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'about_accessories_title' 			=> 'Tentang Aksesoris',
+    'about_accessories_text'  			=> 'Aksesoris adalah Aset yang tidak memiliki nomor seri (atau Anda tidak peduli tentang pelacakan mereka secara unik). Misalnya, mouse komputer atau keyboard.',
+    'accessory_category' 				=> 'Kategori Aksesoris',
+    'accessory_name'  					=> 'Nama Aksesoris',
+    'create'  							=> 'Buat Aksesoris',
+    'eula_text'							=> 'Kategori EULA',
+    'eula_text_help'					=> 'Bidang ini memungkinkan Anda untuk menyesuaikan EULA Anda untuk jenis tertentu dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan default primer.',
+    'require_acceptance'				=> 'Mengharuskan pengguna untuk mengkonfirmasi penerimaan aset dalam kategori ini.',
+    'no_default_eula'					=> 'Tidak ada EULA standar utama yang ditemukan. Tambahkan satu di Settings.',
     'qty'  								=> 'QTY',
     'total'  							=> 'Total',
-    'remaining'  						=> 'Avail',
-    'update'  							=> 'Update Accessory',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'remaining'  						=> 'Tersedia',
+    'update'  							=> 'Perbarui Aksesoris',
+    'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> standar primer EULA </a> gantinya.',
+    'use_default_eula_disabled'			=> '<del> Gunakan EULA standar utama sebagai gantinya. </ del> Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.',
 
 );

app/lang/en-ID/admin/accessories/message.php

@@ -2,35 +2,35 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
-    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+    'does_not_exist' => 'Kategori tidak ada.',
+    'assoc_users'	 => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Kategori gagal dibuat, silakan coba lagi.',
+        'success' => 'Kategori berhasil disimpan.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Kategori tidak terupdate, silakan coba lagi',
+        'success' => 'Kategori berhasil diupdate.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Apakah Anda yakin ingin menghapus kategori ini?',
+        'error'   => 'Ada masalah menghapus kategori. Silakan coba lagi.',
+        'success' => 'Kategori berhasil dihapus.'
     ),
     
      'checkout' => array(
-        'error'   		=> 'Accessory was not checked out, please try again',
-        'success' 		=> 'Accessory checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Aksesori belum diperiksa, silakan coba lagi',
+        'success' 		=> 'Aksesori berhasil diperiksa.',
+        'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Accessory was not checked in, please try again',
-        'success' 		=> 'Accessory checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Aksesori belum diperiksa, silakan coba lagi',
+        'success' 		=> 'Aksesori berhasil diperiksa.',
+        'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.'
     )
 
 

app/lang/en-ID/admin/accessories/table.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Download CSV',
+	'dl_csv'      				=> 'Unduh CSV',
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Accessory Name',
+    'require_acceptance'      	=> 'Penerimaan',
+    'title'      				=> 'Nama Aksesoris',
 
 
 );

app/lang/en-ID/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
-        'title'                  => 'Title',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
-        'cost'                   => 'Cost',
-        'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
-        'notes'                  => 'Notes',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'asset_maintenance_type' => 'Jenis Pemeliharaan Aset',
+        'title'                  => 'Judul',
+        'start_date'             => 'Tanggal Mulai',
+        'completion_date'        => 'Tanggal selesai',
+        'cost'                   => 'Biaya',
+        'is_warranty'            => 'Peningkatan garansi',
+        'asset_maintenance_time' => 'Waktu Maintenance aset (dalam hari)',
+        'notes'                  => 'Catatan',
+        'update'                 => 'Update Maintenance Aset',
+        'create'                 => 'Buat Maintenance Aset'
     ];

app/lang/en-ID/admin/asset_maintenances/general.php

@@ -1,11 +1,11 @@
 <?php
 
     return [
-        'asset_maintenances' => 'Asset Maintenances',
-        'edit'               => 'Edit Asset Maintenance',
-        'delete'             => 'Delete Asset Maintenance',
-        'view'               => 'View Asset Maintenance Details',
-        'repair'             => 'Repair',
-        'maintenance'        => 'Maintenance',
-        'upgrade'            => 'Upgrade'
+        'asset_maintenances' => 'Pemeliharaan Aset',
+        'edit'               => 'Edit Pemeliharaan Aset',
+        'delete'             => 'Hapus Pemeliharaan Aset',
+        'view'               => 'Tampilkan Detail Pemeliharaan Aet',
+        'repair'             => 'Perbaikan',
+        'maintenance'        => 'Pemeliharaan',
+        'upgrade'            => 'Perbarui'
     ];

app/lang/en-ID/admin/asset_maintenances/message.php

@@ -1,17 +1,17 @@
 <?php
 
     return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Pemeliharaan Aset yang Anda cari tidak ditemukan!',
         'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Apakah Anda yakin ingin menghapus pemeliharaan aset ini?',
+            'error'   => 'Ada masalah menghapus pemeliharaan aset. Silakan coba lagi.',
+            'success' => 'Pemeliharaan aset berhasil dihapus.'
         ],
         'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Pemeliharaan Aset gagal dibuat, silakan coba lagi.',
+            'success' => 'Pemeliharaan Aset berhasil dibuat.'
         ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
-        'warranty'                     => 'Warranty',
-        'not_warranty'                 => 'Not Warranty',
+        'asset_maintenance_incomplete' => 'Belum selesai',
+        'warranty'                     => 'Jaminan',
+        'not_warranty'                 => 'Tidak ada Jaminan',
     ];

app/lang/en-ID/admin/asset_maintenances/table.php

@@ -1,9 +1,9 @@
 <?php
 
     return [
-        'title'         => 'Asset Maintenance',
-        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Supplier Name',
-        'is_warranty'   => 'Warranty',
-        'dl_csv'        => 'Download CSV'
+        'title'         => 'Pemeliharaan Aset',
+        'asset_name'    => 'Nama Aset',
+        'supplier_name' => 'Nama Suplayer',
+        'is_warranty'   => 'Jaminan',
+        'dl_csv'        => 'Unduh CSV'
     ];

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

@@ -1,22 +1,22 @@
 <?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',
-    'checkin_email'                     => 'Send email to user on checkin.',
-    'clone'                             => 'Clone Category',
-    'create'  							=> 'Create Category',
-    'edit'                              => 'Edit Category',
-    'eula_text'							=> 'Category EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
-    'required_eula'						=> 'This user will be emailed a copy of the EULA',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
-    'update'  							=> 'Update Category',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'about_asset_categories' 			=> 'Tentang Kategori Aset',
+    'about_categories'  				=> 'Kategori aset membantu Anda mengatur aset. Beberapa kategori contoh mungkin & quot; Desktop & quot;, & quot; Laptop & quot;, & quot; Mobile Phones & quot;, & quot; Tablet & quot;, dan sebagainya, tetapi Anda dapat menggunakan kategori aset dengan cara apapun yang masuk akal bagi Anda.',
+    'asset_categories' 					=> 'Kategori Aset',
+    'category_name'  					=> 'Nama Kategori',
+    'checkin_email'                     => 'Kirim email ke pengguna saat pengecekan.',
+    'clone'                             => 'Salin Kategori',
+    'create'  							=> 'Buat Kategori',
+    'edit'                              => 'Edit Kategori',
+    'eula_text'							=> 'Kategori EULA',
+    'eula_text_help'					=> 'Bidang ini memungkinkan Anda untuk menyesuaikan EULA Anda untuk jenis tertentu dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan default primer.',
+    'require_acceptance'				=> 'Mengharuskan pengguna untuk mengkonfirmasi penerimaan aset dalam kategori ini.',
+    'required_acceptance'				=> 'Pengguna ini akan dikirimkan melalui email dengan link untuk mengkonfirmasi penerimaan item ini.',
+    'required_eula'						=> 'Pengguna ini akan dikirimkan melalui email salinan EULA',
+    'no_default_eula'					=> 'Tidak ada EULA standar utama yang ditemukan. Tambahkan satu di Settings.',
+    'update'  							=> 'Update Kategori',
+    'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> standar primer EULA </a> gantinya.',
+    'use_default_eula_disabled'			=> '<del> Gunakan EULA standar utama sebagai gantinya. </ del> Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.',
 
 );

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

@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
-    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'does_not_exist' => 'Kategori tidak ada.',
+    'assoc_users'	 => 'Kategori ini saat ini terkait dengan setidaknya satu model dan tidak dapat dihapus. Silahkan update model Anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Kategori gagal dibuat, silahkan coba lagi.',
+        'success' => 'Kategori Berhasil dibuat.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Kategori gagal diupdate, silahkan coba lagi',
+        'success' => 'Kategori berhasil diupdate.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Apakah Anda yakin ingin menghapus kategori ini?',
+        'error'   => 'Ada masalah saat menghapus kategori. Silakan coba lagi.',
+        'success' => 'Kategori berhasil dihapus.'
     )
 
 );

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

@@ -3,8 +3,8 @@
 return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'parent'   					=> 'Parent',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Asset Category Name',
+    'parent'   					=> 'Induk',
+    'require_acceptance'      	=> 'Penerimaan',
+    'title'      				=> 'Nama Kategori Aset',
 
 );

app/lang/en-ID/admin/consumables/general.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_consumables_title' 			=> 'About Consumables',
-    'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    'consumable_name'                  => 'Consumable Name',
-    'create'                             => 'Create Consumable',
-    'remaining' 			             => 'Remaining',
+    'about_consumables_title' 			=> 'Tentang Consumables',
+    'about_consumables_text'  			=> 'Consumables adalah sesuatu yang dibeli yang akan digunakan dari waktu ke waktu. Misalnya, tinta printer atau kertas fotokopi.',
+    'consumable_name'                  => 'Nama Consumable',
+    'create'                             => 'Buat Consumable',
+    'remaining' 			             => 'Tersisa',
     'total' 			                 => 'Total',
     'update'                            => 'Update Consumable',
 );

app/lang/en-ID/admin/consumables/message.php

@@ -2,34 +2,34 @@
 
 return array(
 
-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'Consumable Tidak ada.',
 
     'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'Consumable gagal dibuat, silahkan coba lagi.',
+        'success' => 'Consumable berhasil dibuat.'
     ),
 
     'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'Consumable gagal diupdate, silahkan coba lagi',
+        'success' => 'Consumable berhasil diupdate.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Apakah Anda yakin ingin menghapus Consumable ini?',
+        'error'   => 'Ada masalah menghapus Consumable. Silakan coba lagi.',
+        'success' => 'Consumable berhasil dihapus.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Consumable tidak diperiksa, silakan coba lagi',
+        'success' 		=> 'Consumable berhasil diperiksa.',
+        'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Consumable tidak diperiksa, silakan coba lagi',
+        'success' 		=> 'Consumable berhasil di-check in.',
+        'user_does_not_exist' => 'Pengguna tidak valid. Silakan coba lagi.'
     )
 
 

app/lang/en-ID/admin/consumables/table.php

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'Nama Konsumable',
 );

app/lang/en-ID/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'  			=> 'Tentang Penyusutan Aset',
+    'about_depreciations'  					=> 'Anda dapat mengatur depresiasi aset berdasarkan straight-line depreciation.',
+    'asset_depreciations'  					=> 'Penyusutan Aset',
+    'create_depreciation'  					=> 'Buat Penyusutan',
+    'depreciation_name'  					=> 'Nama Penyusutan',
+    'number_of_months'  					=> 'Jumlah Bulan',
+    'update_depreciation'  					=> 'Update Penyusutan',
 
 );

app/lang/en-ID/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' => 'Kelas penyusutan tidak ada.',
+    'assoc_users'	 => 'Penyusutan ini terkait dengan satu atau lebih model dan tidak dapat dihapus. Hapus model, dan kemudian coba hapus lagi. ',
 
 
     'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'Kelas depresiasi gagal dibuat, silakan coba lagi. :(',
+        'success' => 'Kelas penyusutan berhasil dibuat. :)'
     ),
 
     'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'Kelas depresiasi gagal diperbarui, silakan coba lagi',
+        'success' => 'Kelas penyusutan berhasil diperbarui.'
     ),
 
     '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'   => 'Apakah Anda yakin ingin menghapus kelas depresiasi ini?',
+        'error'   => 'Ada masalah menghapus kelas penyusutan. Silakan coba lagi.',
+        'success' => 'Kelas depresiasi berhasil dihapus.'
     )
 
 );

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

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

app/lang/en-ID/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'        => 'Grup sudah ada!',
+    'group_not_found'     => 'Group [:id] tidak ada.',
+    'group_name_required' => 'Nama field diperlukan',
 
     'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Group berhasil dibuat.',
+        'update' => 'Grup berhasil diperbarui.',
+        'delete' => 'Grup berhasil dihapus.',
     ),
 
     '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'   => 'Apakah Anda yakin ingin menghapus grup ini?',
+        'create' => 'Ada masalah saat membuat Grup. Silakan coba lagi.',
+        'update' => 'Ada masalah saat memperbarui Grup. Silakan coba lagi.',
+        'delete' => 'Ada masalah saat menghapus grup. Silakan coba lagi.',
     ),
 
 );

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

@@ -3,7 +3,7 @@
 return array(
 
     'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'name'       => 'Nama',
+    'users'      => '# Pengguna',
 
 );

app/lang/en-ID/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' 	 	=> 'Manajemen grup',
+    'create_group' 	 		=> 'Buat Grup Baru',
+    'edit_group' 	 		=> 'Edit Grup',
+    'group_name' 	 		=> 'Nama Grup',
+    'group_admin' 	 		=> 'Admin Kelompok',
+    'allow' 	 			=> 'Diijinkan',
+    'deny' 	 				=> 'Dilarang',
 
 );

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

@@ -2,12 +2,12 @@
 
 return array(
 
-	'bulk_update'		=> 'Bulk Update Assets',
-	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
-	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
-    'checkedout_to'		=> 'Checked Out To',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
+	'bulk_update'		=> 'Perbarui Aset secara massal',
+	'bulk_update_help'	=> 'Formulir ini memungkinkan Anda untuk memperbarui beberapa aset sekaligus. Hanya mengisi kolom yang Anda butuhkan untuk mengubah. Setiap bidang dibiarkan kosong tidak berubah. ',
+	'bulk_update_warn'	=> 'Anda akan mengedit properti :asset_count aset.',
+    'checkedout_to'		=> 'Checkout ke',
+    'checkout_date'		=> 'Tanggal Check out',
+    'checkin_date'		=> 'Tanggal Check in',
     'checkout_to'		=> 'Checkout to',
     'cost'				=> 'Purchase Cost',
     'create'			=> 'Create Asset',

app/lang/en/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/es-CO/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/es-ES/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Esta seguro de querer borrar este accesorio?',
+        'confirm'   => '¿Está seguro que desea eliminar este consumible?',
         'error'   => 'Hubo un error al borrar este consumible. Por favor intente nuevamente.',
-        'success' => 'El accesorio fue borrado con éxito.'
+        'success' => 'El consumible ha sido eliminado correctamente.'
     ),
 
      'checkout' => array(

app/lang/fi/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -5,7 +5,7 @@ return array(
     'about_accessories_text'  			=> 'Les accessoires sont des items que vous assignerai à des utilisateurs mais qui n\'ont pas de numéro de série (ou que vous ne désirez pas en faire un suivi). Par exemple, une souris ou un clavier.',
     'accessory_category' 				=> 'Catégorie d\'accessoire',
     'accessory_name'  					=> 'Nom de l\'accessoire',
-    'create'  							=> 'Création d\'accéssoire',
+    'create'  							=> 'Création d\'accessoire',
     'eula_text'							=> 'License de catégorie',
     'eula_text_help'					=> 'Ce champ vous permet de configurer vos licenses d\'utilisation pour chaque type d\'items. Si vous avez seulement une license pour tout vos items, vous pouvez cochez la case ci-dessous pour utiliser celle par défaut.',
     'require_acceptance'				=> 'L\'utilisateur doit confirmer qu\'il accepte les items dans cette catégorie.',
@@ -13,8 +13,8 @@ return array(
     'qty'  								=> 'Quantité',
     'total'  							=> 'Total',
     'remaining'  						=> 'Dispo',
-    'update'  							=> 'Mise à jour d\'accéssoires',
+    'update'  							=> 'Mise à jour d\'accessoires',
     'use_default_eula'					=> 'Utiliser la <a href="#" data-toggle="modal" data-target="#eulaModal">license primaire par défaut </a> à la place.',
-    'use_default_eula_disabled'			=> '<del>Utilisez la license par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Réglages".',
+    'use_default_eula_disabled'			=> '<del>Utilisez la license par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".',
 
 );

app/lang/fr/admin/accessories/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'La catégorie n\'éxiste pas.',
-    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+    'assoc_users'	 => 'Cet accessoire à présentement des items d\'attribué à des utilisateurs. S\'il vous plaît vérifier l\'accessoire et veuillez réessayer. ',
 
     'create' => array(
         'error'   => 'La catégorie n\'a pas été crée, veuillez essayer à nouveau.',
@@ -12,7 +12,7 @@ return array(
 
     'update' => array(
         'error'   => 'Catégorie n\'a pas été actualisée, veuillez réessayer',
-        'success' => 'Category updated successfully.'
+        'success' => 'Catégorie actualisée correctement.'
     ),
 
     'delete' => array(
@@ -22,15 +22,15 @@ return array(
     ),
     
      'checkout' => array(
-        'error'   		=> 'Accessory was not checked out, please try again',
-        'success' 		=> 'Accessory checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Cet accessoire n\'est pas attribué. Veuillez réessayer',
+        'success' 		=> 'Accessoire attribué correctement.',
+        'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Accessory was not checked in, please try again',
-        'success' 		=> 'Accessory checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Cet accessoire n\'a pas été dissocié, veuillez réessayer',
+        'success' 		=> 'Accessoire dissocié correctement.',
+        'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.'
     )
 
 

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

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Download CSV',
-	'eula_text'      			=> 'EULA',
+	'dl_csv'      				=> 'Télécharger en CSV',
+	'eula_text'      			=> 'Licence d\'utilisation',
     'id'      					=> 'ID',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Accessory Name',
+    'require_acceptance'      	=> 'Acceptation',
+    'title'      				=> 'Nom de l\'accessoire',
 
 
 );

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

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
-        'title'                  => 'Title',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
-        'cost'                   => 'Cost',
-        'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'asset_maintenance_type' => 'Type d\'entretien d\'actif',
+        'title'                  => 'Titre',
+        'start_date'             => 'Date de début',
+        'completion_date'        => 'Date d\'achèvement',
+        'cost'                   => 'Coût',
+        'is_warranty'            => 'Garantie sur amélioration',
+        'asset_maintenance_time' => 'Durée de l\'entretien (en jours)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'Modification des types entretiens d\'actifs',
+        'create'                 => 'Création de type d\'entretien d\'actif'
     ];

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

@@ -1,11 +1,11 @@
 <?php
 
     return [
-        'asset_maintenances' => 'Asset Maintenances',
-        'edit'               => 'Edit Asset Maintenance',
-        'delete'             => 'Delete Asset Maintenance',
-        'view'               => 'View Asset Maintenance Details',
-        'repair'             => 'Repair',
-        'maintenance'        => 'Maintenance',
-        'upgrade'            => 'Upgrade'
+        'asset_maintenances' => 'Entretien d\'actifs',
+        'edit'               => 'Modification d\'entretiens d\'actifs',
+        'delete'             => 'Supprimer des entretiens d\'actif',
+        'view'               => 'Voir les détails de la maintenance d\'actif',
+        'repair'             => 'Réparation',
+        'maintenance'        => 'Entretien',
+        'upgrade'            => 'Mise à niveau'
     ];

app/lang/fr/admin/asset_maintenances/message.php

@@ -1,17 +1,17 @@
 <?php
 
     return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Le type d\'entretien d\'actif recherché n\'a pas été trouvé!',
         'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Êtes-vous certain de vouloir supprimer ce type d\'entretien d\'actif ?',
+            'error'   => 'Il y a eu un problème lors de la suppression du type d\'entretien d\'actif. Veuillez réessayer.',
+            'success' => 'Le type d\'entretien d\'actif a été supprimé correctement.'
         ],
         'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Le type d\'entretien d\'actif n\'a pas été créé, veuillez réessayer.',
+            'success' => 'Le type d\'entretien d\'actif a été créé correctement.'
         ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
-        'warranty'                     => 'Warranty',
-        'not_warranty'                 => 'Not Warranty',
+        'asset_maintenance_incomplete' => 'Pas encore complété',
+        'warranty'                     => 'Garantie',
+        'not_warranty'                 => 'Non garantie',
     ];

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

@@ -1,9 +1,9 @@
 <?php
 
     return [
-        'title'         => 'Asset Maintenance',
-        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Supplier Name',
-        'is_warranty'   => 'Warranty',
-        'dl_csv'        => 'Download CSV'
+        'title'         => 'Entretien d\'actifs',
+        'asset_name'    => 'Nom de l\'actif',
+        'supplier_name' => 'Nom du fournisseur',
+        'is_warranty'   => 'Garantie',
+        'dl_csv'        => 'Télécharger en CSV'
     ];

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

@@ -5,18 +5,18 @@ return array(
     'about_categories'  				=> 'Les catégories vous aident à organiser vos biens. Des exemples de catégories peuvent être "Ordinateurs de bureau", "Ordinateurs portables", "Téléphones portables", "Tablettes", etc..., mais vous pouvez utiliser les catégories comme cela vous convient. ',
     'asset_categories' 					=> 'Catégories',
     'category_name'  					=> 'Catégorie',
-    'checkin_email'                     => 'Send email to user on checkin.',
-    'clone'                             => 'Clone Category',
+    'checkin_email'                     => 'Envoyer un courriel à l\'utilisateur lors de l\'attribution.',
+    'clone'                             => 'Cloner la catégorie',
     'create'  							=> 'Créer Catégorie',
-    'edit'                              => 'Edit Category',
-    'eula_text'							=> 'Category EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
-    'required_eula'						=> 'This user will be emailed a copy of the EULA',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'edit'                              => 'Modifier la catégorie',
+    'eula_text'							=> 'Catégorie de licence d\'utilisation',
+    'eula_text_help'					=> 'Ce champ vous permet de configurer vos licences d\'utilisation pour chaque type d\'items. Si vous avez seulement une licence pour tout vos items, vous pouvez cochez la case ci-dessous pour utiliser celle par défaut.',
+    'require_acceptance'				=> 'L\'utilisateur doit confirmer qu\'il accepte les actifs de cette catégorie.',
+    'required_acceptance'				=> 'L\'utilisateur recevra un courriel avec un lien de confirmation pour accepter ce produit.',
+    'required_eula'						=> 'Cet utilisateur recevra par courriel une copie de la licence d\'utilisation',
+    'no_default_eula'					=> 'Il n\'y a pas de licence d\'utilisation par défaut. Veuillez en ajouter une dans Préférences.',
     'update'  							=> 'Actualiser Catégorie',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula'					=> 'Utiliser la <a href="#" data-toggle="modal" data-target="#eulaModal">license primaire par défaut </a> à la place.',
+    'use_default_eula_disabled'			=> '<del>Utilisez la licence par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".',
 
 );

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

@@ -1,10 +1,10 @@
 <?php
 
 return array(
-	'eula_text'      			=> 'EULA',
+	'eula_text'      			=> 'Licence d\'utilisation',
     'id'      					=> 'ID',
     'parent'   					=> 'Parent',
-    'require_acceptance'      	=> 'Acceptance',
+    'require_acceptance'      	=> 'Acceptation',
     'title'      				=> 'Nom de Catégorie',
 
 );

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

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-    'about_consumables_title' 			=> 'About Consumables',
-    'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    'consumable_name'                  => 'Consumable Name',
-    'create'                             => 'Create Consumable',
-    'remaining' 			             => 'Remaining',
+    'about_consumables_title' 			=> 'À propos des fournitures',
+    'about_consumables_text'  			=> 'Les fournitures sont des biens qui seront utilisés au fil du temps. Par exemple de l\'encre ou du papier pour les imprimantes.',
+    'consumable_name'                  => 'Nom de la fourniture',
+    'create'                             => 'Créer une fourniture',
+    'remaining' 			             => 'Quantité restante',
     'total' 			                 => 'Total',
-    'update'                            => 'Update Consumable',
+    'update'                            => 'Actualiser la fourniture',
 );

app/lang/fr/admin/consumables/message.php

@@ -2,34 +2,34 @@
 
 return array(
 
-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'Cette fourniture n\'existe pas.',
 
     'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'La fourniture n\'a pas été créé, veuillez réessayer.',
+        'success' => 'La fourniture a été créé correctement.'
     ),
 
     'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'La fourniture n\'a pas été actualisé, veuillez réessayer',
+        'success' => 'La fourniture a été actualisé correctement.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Êtes-vous certain de vouloir détruire cette fourniture ?',
+        'error'   => 'Il y a eu un problème en détruisant la fourniture. Veuillez réessayer.',
+        'success' => 'La fourniture a été détruite correctement.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'La fourniture n\'a pas été attribué correctement, veuillez réessayer',
+        'success' 		=> 'La fourniture a été attribué correctement.',
+        'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'La fourniture n\'a pas été dissocié correctement, veuillez réessayer',
+        'success' 		=> 'La fourniture à été dissocié correctement.',
+        'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.'
     )
 
 

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

@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'Nom de la fourniture',
 );

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

@@ -2,12 +2,12 @@
 
 return array(
 
-	'bulk_update'		=> 'Bulk Update Assets',
-	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
-	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
+	'bulk_update'		=> 'Mise à jour en bloc d\'actifs',
+	'bulk_update_help'	=> 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Seulement remplir les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ',
+	'bulk_update_warn'	=> 'Vous êtes sur le point de modifier les propriétés de l\'actif :asset_count .',
     'checkedout_to'		=> 'Extrait vers',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
+    'checkout_date'		=> 'Date d\'attribution',
+    'checkin_date'		=> 'Date de dissociation',
     'checkout_to'		=> 'Caisse à',
     'cost'				=> 'Coût d\'achat',
     'create'			=> 'Créer des actifs',
@@ -17,11 +17,11 @@ return array(
     'default_location'	=> 'Emplacement par défaut',
     'eol_date'			=> 'Date de fin de vie',
     'eol_rate'			=> 'Taux de EOL',
-    'expected_checkin'  => 'Expected Checkin Date',
+    'expected_checkin'  => 'Date de dissociation prévue',
     'expires'			=> 'Expire',
     'fully_depreciated'	=> 'Entièrement amortis',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
-    'mac_address'		=> 'MAC Address',
+    'help_checkout'		=> 'Si vous souhaitez attribuer cet actif immédiatement, sélectionnez "prêt à déployer" dans la liste ci-dessus. ',
+    'mac_address'		=> 'Adresse MAC',
     'manufacturer'		=> 'Fabricant',
     'model'				=> 'Modèle',
     'months'			=> 'Mois',
@@ -30,7 +30,7 @@ return array(
     'order'				=> 'Numéro de Commande',
     'qr'				=> 'Code QR',
     'requestable'		=> 'Les utilisateurs peuvent demander à cet actif',
-    'select_statustype'	=> 'Select Status Type',
+    'select_statustype'	=> 'Choisissez le type de statut',
     'serial'			=> 'Série ',
     'status'			=> 'Statut',
     'supplier'			=> 'Fournisseur',

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

@@ -1,19 +1,19 @@
 <?php
 
 return array(
-	'archived'  				=> 'Archived',
+	'archived'  				=> 'Retiré',
     'asset'  					=> 'Biens',
     'checkin'  					=> 'Retour des Biens',
     'checkout'  				=> 'Sortie des Biens',
     'clone'  					=> 'Cloner le Bien',
-    'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'deployable'  				=> 'Déployable',
+    'deleted'  					=> 'Cet actif a été détruit. <a href="/hardware/:asset_id/restore">Cliquez ici pour le restaurer</a>.',
     'edit'  					=> 'Editer le Bien',
-	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
-    'requestable'				=> 'Requestable',
-    'restore'  					=> 'Restore Asset',
-    'pending'  					=> 'Pending',
-    'undeployable'  			=> 'Undeployable',
+	'filetype_info'				=> 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'model_deleted'  			=> 'Ce modèle d\'actif a été supprimé. Vous devez le restaurer avant de restaurer l\'actif.<br/> <a href="/hardware/models/:model_id/restore">Cliquez ici pour le restaurer</a>.',
+    'requestable'				=> 'Réquisitionnable',
+    'restore'  					=> 'Restaurer l\'actif',
+    'pending'  					=> 'En attente',
+    'undeployable'  			=> 'Non déployable',
     'view'  					=> 'Voir le Bien',
 );

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

@@ -2,10 +2,10 @@
 
 return array(
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
+    'undeployable' 		=> '<strong>Attention: </strong> Ce bien a été marqué non déployable.
+                        Si ce statut a changé, veuillez l\'actualiser.',
     'does_not_exist' 	=> 'Ce bien n\'existe pas.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
+    'does_not_exist_or_not_requestable' => 'Cet actif n\'existe pas ou ne peux pas être réquisitionné.',
     'assoc_users'	 	=> 'Ce bien est marqué sorti par un utilisateur et ne peut être supprimé. Veuillez d\'abord cliquer sur Retour de Biens, et réessayer.',
 
     'create' => array(
@@ -16,24 +16,24 @@ return array(
     'update' => array(
         'error'   			=> 'Ce bien n\'a pas été actualisé, veuillez réessayer',
         'success' 			=> 'Bien actualisé correctement.',
-        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'nothing_updated'	=>  'Aucun champ n\'a été sélectionné, rien n\'a été actualisé.',
     ),
 
     'restore' => array(
-        'error'   		=> 'Asset was not restored, please try again',
-        'success' 		=> 'Asset restored successfully.'
+        'error'   		=> 'L\'actif n\'a pas été restauré, veuillez réessayer',
+        'success' 		=> 'Actif restauré correctement.'
     ),
 
     'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'Le fichier n\'a pas été détruit. Veuillez réessayer.',
+        'success' => 'Fichier détruit correctement.',
     ),
 
     'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        '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.',
+        'error'   => 'Le(s) fichier(s) n\'ont pas pu être téléversé. Veuillez réessayer.',
+        'success' => 'Le(s) fichier(s) ont été téléversé correctement.',
+        'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléchargement ou le fichier que vous essayez de télécharger est trop gros',
+        'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop gros, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.',
     ),
 
 

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

@@ -18,6 +18,6 @@ return array(
     'serial'   		=> 'Numéro de série',
     'status'   		=> 'Statut',
     'title'      	=> 'Actif ',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'days_without_acceptance' => 'Jours sans acceptation'
 
 );

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

@@ -15,7 +15,7 @@ return array(
     'notes'             => 'Notes',
     'order'             => 'Commande n°.',
     'purchase_order'    => 'Numéro de commande',
-    'reassignable'      => 'Reassignable',
+    'reassignable'      => 'Réattribuables',
     'remaining_seats'   => 'Postes restants',
     'seats'             => 'Postes',
     'serial'            => 'Clé de licence',

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

@@ -6,7 +6,7 @@ return array(
     'checkout_history'  		=> 'Historique des associations',
     'checkout'  				=> 'Associer la licence multiposte',
     'edit'  					=> 'Éditer la licence',
-    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'filetype_info'				=> 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'clone'  					=> 'Cloner la licence',
     'history_for'  				=> 'Historique pour ',
     'in_out'  					=> 'Associer/Libérer',

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

@@ -22,7 +22,7 @@ return array(
     'upload' => array(
         'error'   => 'Le(s) fichier(s) n\'a pas pu être uploadé. Merci de réessayer.',
         'success' => 'Le(s) fichier(s) a bien été uploadé.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléchargement ou le fichier que vous essayez de télécharger est trop gros',
         'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop lourds, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.',
     ),
 

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

@@ -4,8 +4,8 @@ return array(
 
     'does_not_exist' => 'Le lieu n\'existe pas.',
     'assoc_users'	 => 'Ce lieu est actuellement associé avec au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à ce lieu et essayez à nouveau. ',
-    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'Cet emplacement est actuellement associé à au moins un utilisateur et ne peut pas être supprimé. Veuillez mettre à jour vos utilisateurs pour ne plus faire référence à cet emplacement et réessayez. ',
+    'assoc_child_loc'	 => 'Cet emplacement est actuellement le parent d\'au moins un sous emplacement et ne peut pas être supprimé . S\'il vous plaît mettre à jour vos emplacement pour ne plus le référencer et réessayez. ',
 
 
     'create' => array(

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

@@ -13,5 +13,5 @@ return array(
     'zip'			=> 'Code postal',
     'locations'		=> 'Lieux',
     'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency', // this is deprecated
+    'currency'  	=> 'Devise de l\'emplacement', // this is deprecated
 );

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

@@ -2,10 +2,10 @@
 
 return array(
 
-    'deleted'  					=> 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
-    'restore'                   => 'Restore Model',
-	'show_mac_address'			=> 'Show MAC address field in assets in this model',
-    'view_deleted'              => 'View Deleted',
-    'view_models'               => 'View Models',
+    'deleted'  					=> 'Ce modèle a été détruit. <a href="/hardware/models/:model_id/restore">Cliquez ici pour le restaurer</a>.',
+    'restore'                   => 'Restaurer le modèle',
+	'show_mac_address'			=> 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif',
+    'view_deleted'              => 'Voir les modèles détruits',
+    'view_models'               => 'Voir les différents modèles',
 
 );

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

@@ -9,7 +9,7 @@ return array(
     'create' => array(
         'error'   => 'Le modèle n\'a pas été créé, veuillez essayer à nouveau.',
         'success' => 'Le modèle a été créé avec succès.',
-        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+        'duplicate_set' => 'Un modèle d\'actif avec ce nom, fabricant et modèle existe déjà.',
     ),
 
     'update' => array(
@@ -24,8 +24,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   		=> 'Model was not restored, please try again',
-        'success' 		=> 'Model restored successfully.'
+        'error'   		=> 'Le modèle d\'actif n\'a pas été restauré, veuillez réessayer',
+        'success' 		=> 'Modèle d\'actif restauré correctement.'
     ),
 
 );

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

@@ -1,34 +1,34 @@
 <?php
 
 return array(
-	'alert_email'				=> 'Send alerts to',
-	'alerts_enabled'			=> 'Alerts enabled',
-	'asset_ids'					=> 'Asset IDs',
+	'alert_email'				=> 'Envoyer les alertes à',
+	'alerts_enabled'			=> 'Alertes activées',
+	'asset_ids'					=> 'ID de l\'actif',
 	'auto_increment_assets'		=> 'Générer des identifiants d\'actifs auto-incrémentés',
 	'auto_increment_prefix'		=> 'Préfixe (optionnel)',
-	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
-	'backups'					=> 'Backups',
-	'barcode_type'				=> 'Barcode Type',
-	'barcode_settings'			=> 'Barcode Settings',
-	'custom_css'				=> 'Custom CSS',
-	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
-	'default_currency'  		=> 'Default Currency',
-	'default_eula_text'			=> 'Default EULA',
-	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+	'auto_incrementing_help'    => 'Activer l\'auto-incrémentation des ID d\'actif avant de sélectionner cette option',
+	'backups'					=> 'Sauvegardes',
+	'barcode_type'				=> 'Type de code à bar',
+	'barcode_settings'			=> 'Configuration des codes à barres',
+	'custom_css'				=> 'CSS personnalisé',
+	'custom_css_help'			=> 'Entrez les codes CSS personnalisé que vous souhaitez utiliser . Ne pas inclure les balises &lt;style&gt;&lt;/style&gt;.',
+	'default_currency'  		=> 'Devise par défaut',
+	'default_eula_text'			=> 'Licence d\'utilisation par défaut',
+	'default_eula_help_text'	=> 'Vous pouvez également associer les licences d\'utilisations personnalisés à des catégories spécifiques d\'actifs .',
     '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',
     'display_qr'                => 'Afficher les QR codes',
-    'eula_settings'				=> 'EULA Settings',
-    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'general_settings'			=> 'General Settings',
-	'generate_backup'			=> 'Generate Backup',
-    'header_color'              => 'Header Color',
+    'eula_settings'				=> 'Configuration pour les licences d\'utilisation',
+    'eula_markdown'				=> 'Cette licence d\'utilisation permet l\'utilisation des <a href="https://help.github.com/articles/github-flavored-markdown/">"Github flavored markdown"</a>.',
+    'general_settings'			=> 'Configuration générale',
+	'generate_backup'			=> 'Générer une sauvegarde',
+    'header_color'              => 'Couleur de l\'en-tête',
     'info'                      => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.',
     'laravel'                   => 'Version de Laravel',
-    'load_remote'				=> 'This Snipe-IT install can load scripts from the outside world.',
+    'load_remote'				=> 'Cette installation permet de charger des scripts du monde extérieur.',
     'logo'                    	=> 'Logo',
-    'optional'					=> 'optional',
+    'optional'					=> 'facultatif',
     'per_page'                  => 'Résultats par page',
     'php'                       => 'Version de PHP',
     'php_gd_info'               => 'Vous devez installer php-gd afin d\'afficher les QR codes (voir les instructions d\'installation).',
@@ -41,8 +41,8 @@ return array(
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',
     'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new">create an incoming webhook</a> on your Slack account.',
+    'slack_integration'         => 'Configuration "Slack"',
+    'slack_integration_help'    => 'L\'intégration de Slack est facultative, mai le "endpoint" et le "channel" sont nécessaires pour son utilisation. Pour configurer l\'intégration Slack, vous devez d\'abord <a href=":slack_link" target="_new">créer un "incoming webhook"</a> dans votre compte Slack.',
     'snipe_version'  			=> 'Version de Snipe-IT',
     'system'                    => 'Information du système',
     'update'                    => 'Mettre à jour les paramètres',

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

@@ -8,10 +8,10 @@ return array(
         'success'               => 'Les paramètres ont été mis à jour avec succès.'
     ),
     'backup' => array(
-        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
-        'file_deleted'          => 'The backup file was successfully deleted. ',
-        'generated'             => 'A new backup file was successfully created.',
-        'file_not_found'        => 'That backup file could not be found on the server.',
+        'delete_confirm'        => 'Êtes-vous certain de vouloir supprimer ce fichier de sauvegarde ? Cette action ne peut pas être annulée. ',
+        'file_deleted'          => 'Le fichier de sauvegarde a été supprimé correctement. ',
+        'generated'             => 'Un nouveau fichier de sauvegarde a été créé correctement.',
+        'file_not_found'        => 'Ce fichier de sauvegarde n\'a pas pu être trouvé sur le serveur .',
     ),
 
 );

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

@@ -2,14 +2,14 @@
 
 return array(
     'about'      	=> 'À propos des étiquettes de statut',
-    'archived'      	=> 'Archived',
+    'archived'      	=> 'Retiré',
     'create'      	=> 'Créé une étiquette de statut',
-    'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'deployable'      	=> 'Déployable',
+    'info'      	=> 'Les étiquettes d\'état sont utilisés pour décrire les différents états de vos actifs. Ils peuvent être pour réparation , perdu / volé , etc. Vous pouvez créer de nouvelles étiquettes d\'état pour déployable , en attente et actifs retirés.',
     'name'      	=> 'Nom du statut',
-    'pending'      	=> 'Pending',
-    'status_type'   => 'Status Type',
+    'pending'      	=> 'En attente',
+    'status_type'   => 'Type d\'état',
     'title'      	=> 'Étiquette de statut',
-    'undeployable'  => 'Undeployable',
+    'undeployable'  => 'Non déployable',
     'update'      	=> 'Mettre à jour l\'étiquette de statut',
 );

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

@@ -7,12 +7,12 @@ return array(
     'clone'             => 'Cloner l\'utilisateur',
     'contact_user'      => 'Contact :name',
     'edit'              => 'Modifier l\'utilisateur',
-    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'filetype_info'     => 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'history_user'      => 'Historique pour :name',
     'last_login'        => 'Dernière connexion',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
-    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
+    'ldap_config_text'  => 'Les paramètres de configuration LDAP se trouve dans le dossier app/config dans le fichier ldap.php. L\'emplacement choisi sera établi pour tous les utilisateurs téléchargés. Vous avez besoin d\'avoir au moins un emplacement de défini pour utiliser cette fonctionnalité.',
+    'ldap_text'         => 'Connectez-vous à LDAP et créer des utilisateurs. Les mots de passe seront générés automatiquement.',
     'software_user'     => 'Logiciels associés avec :name',
     'view_user'         => 'Voir l\'utilisateur :name',
-    'usercsv'           => 'CSV file',
+    'usercsv'           => 'Fichier CSV',
     );

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

@@ -2,15 +2,15 @@
 
 return array(
 
-    'accepted'                  => 'You have successfully accepted this asset.',
-    'declined'                  => 'You have successfully declined this asset.',
+    'accepted'                  => 'Vous avez accepté cet actif.',
+    'declined'                  => 'Vous avez refusé cet actif.',
     'user_exists'               => 'L\'utilisateur existe déjà !',
     'user_not_found'            => 'L\'utilisateur [:id] n\'existe pas.',
     'user_login_required'       => 'Le champ identifiant est obligatoire',
     'user_password_required'    => 'Le mot de passe est obligatoire.',
     'insufficient_permissions'  => 'Droits insuffisants.',
     'user_deleted_warning'      => 'Cet utilisateur a été supprimé. Vous devez le restaurer pour pouvoir l\'éditer ou lui assigner de nouveaux actifs.',
-    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+    'ldap_not_configured'        => 'L\'intégration LDAP n\'a pas été configuré pour cette installation .',
 
 
     'success' => array(
@@ -22,7 +22,7 @@ return array(
         'suspend'   => 'L’utilisateur a été suspendu avec succès.',
         'unsuspend' => 'L’utilisateur a été activé avec succès.',
         'restored'  => 'L’utilisateur a été restauré avec succès.',
-        'import'    => 'Users imported successfully.',
+        'import'    => 'Les utilisateurs ont été importés correctement.',
     ),
 
     'error' => array(
@@ -30,25 +30,25 @@ return array(
         'update' => 'Un problème a eu lieu pendant la mise à jour de l\'utilisateur. Veuillez essayer à nouveau.',
         'delete' => 'Un problème a eu lieu pendant la suppression de l\'utilisateur. Veuillez essayer à nouveau.',
         'unsuspend' => 'Un problème a eu lieu pendant la réhabilitation de l\'utilisateur. Veuillez essayer à nouveau.',
-        'import'    => 'There was an issue importing users. Please try again.',
-        'asset_already_accepted' => 'This asset has already been accepted.',
-        'accept_or_decline' => 'You must either accept or decline this asset.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'import'    => 'Il y a eu un problème lors de l\'importation des utilisateurs. Veuillez réessayer.',
+        'asset_already_accepted' => 'Cet actif a déjà été accepté.',
+        'accept_or_decline' => 'Vous devez accepter ou refuser cet actif.',
+        'ldap_could_not_connect' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur du serveur LDAP :',
+        'ldap_could_not_bind' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP : ',
+        'ldap_could_not_search' => 'Impossible de rechercher le serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP :',
+        'ldap_could_not_get_entries' => 'Impossible d\'obtenir les entrées du serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP :',
     ),
 
     'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'Le fichier n\'a pas pu être supprimé. Veuillez réessayer.',
+        'success' => 'Le fichier a été supprimé correctement.',
     ),
 
     '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.',
+        'error'   => 'Le(s) fichier(s) n\'ont pas pu être téléversé. Veuillez réessayer.',
+        'success' => 'Le(s) fichier(s) ont été téléversé correctement.',
+        'nofiles' => 'Vous n\'avez pas sélectionné de fichier pour le téléversement',
+        'invalidfiles' => 'Un ou plusieurs de vos fichiers sont trop gros, ou sont d\'un type non autorisé. Les types de fichiers autorisés sont png, gif, jpg, doc, docx, pdf et txt.',
     ),
 
 );

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

@@ -18,15 +18,15 @@ return array(
     'last_login'  			=> 'Dernière connexion',
     'last_name'  			=> 'Nom',
     'location'  			=> 'Lieu',
-    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'lock_passwords'		=> 'Les informations de connexion ne peuvent pas être modifiés sur cette installation .',
     'manager' 				=> 'Responsable',
     'name' 					=> 'Nom',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirmer le mot de passe',
     'password' 				=> 'Mot de passe',
     'phone'  				=> 'Téléphone',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
+    'show_current'          => 'Afficher les utilisateurs actifs',
+    'show_deleted'          => 'Afficher les utilisateurs supprimés',
     'title' 				=> 'Titre',
     'updateuser' 			=> 'Mettre à jour l\'utilisateur',
     'username' 				=> 'Nom d\'utilisateur',

app/lang/fr/auth/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'account_already_exists' => 'Un compte avec cet e-mail existe déjà.',
-    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_found'      => 'Nom d\'usager ou mot de passe incorrect.',
     'account_not_activated'  => 'Ce compte n\'est pas activé.',
     'account_suspended'      => 'Ce compte est suspendu.',
     'account_banned'         => 'Ce compte est banni.',

app/lang/fr/button.php

@@ -8,7 +8,7 @@ return array(
     'delete'  	=> 'Supprimer',
     'edit'    	=> 'Éditer',
     'restore' 	=> 'Restaurer',
-    'request'   => 'Request',
+    'request'   => 'Requête ',
     'submit'  	=> 'Soumettre',
     'upload'    => 'Uploader',
 

app/lang/fr/general.php

@@ -1,16 +1,16 @@
 <?php
 
     return [
-    'accessories'			=> 'Accessories',
-    'accessory'				=> 'Accessory',
-    'accessory_report'			=> 'Accessory Report',
+    'accessories'			=> 'Accessoires',
+    'accessory'				=> 'Accessoire',
+    'accessory_report'			=> 'Rapport sur les accessoires',
     'action'                => 'Action',
-    'activity_report'		=> 'Activity Report',
+    'activity_report'		=> 'Rapport d\'activité',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Tous les actifs',
     'all'       			=> 'Tous',
-    'archived'              => 'Archived',
+    'archived'              => 'Retiré',
     'asset_models'			=> 'Modèles d\'actif',
     'asset'					=> 'Actif',
     'asset_report'          => 'Rapport d\'actif',
@@ -20,18 +20,18 @@
     'avatar_delete'         => 'Supprimer l\'Avatar',
     'avatar_upload'         => 'Charger un Avatar',
     'back'      			=> 'Retour',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bad_data'      		=> 'Aucun résultat, les données sont peut-être erronées?',
     'cancel'  				=> 'Annuler',
-    'categories'			=> 'Categories',
-    'category'				=> 'Category',
+    'categories'			=> 'Catégories',
+    'category'				=> 'Сatégorie',
     'changeemail'  			=> 'Changer l\'adresse e-mail',
     'changepassword'  		=> 'Changer le mot de passe',
     'checkin'  				=> 'Dissocier',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Dissocier de',
     'checkout'  			=> 'Associer',
     'city'  				=> 'Ville',
-    'consumable'			=> 'Consumable',
-    'consumables'			=> 'Consumables',
+    'consumable'			=> 'Fourniture',
+    'consumables'			=> 'Fournitures',
     'country'  				=> 'Pays',
     'create'				=> 'Créer',
     'created_asset'			=> 'Actif créé',
@@ -39,17 +39,17 @@
     'currency'  			=> '€', // this is deprecated
     'current'  				=> 'Actuels',
     'custom_report'         => 'Rapport d\'actif personnalisé',
-    'dashboard'				=> 'Dashboard',
+    'dashboard'				=> 'Tableau de bord',
     'date'					=> 'Date',
     'delete'  				=> 'Supprimer',
     'deleted'  				=> 'Supprimé',
     'deployed'				=> 'Déployé',
     'depreciation_report'	=> 'Rapport d’amortissement',
-    'download'				=> 'Download',
+    'download'				=> 'Télécharger',
     'depreciation'			=> 'Amortissement',
     'editprofile'  			=> 'Éditer votre profile',
     'eol'					=> 'Fin de vie',
-    'first'					=> 'First',
+    'first'					=> 'Premier',
     'first_name'			=> 'Prénom',
     'file_name'				=> 'Fichier',
     'file_uploads'			=> 'Uploads de fichiers',
@@ -60,21 +60,21 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Supprimer l\'image',
     'image_upload'         	=> 'Charger une image',
-    'import'         	    => 'Import',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
+    'import'         	    => 'Importer',
+    'asset_maintenance'        => 'Gestion des actifs',
+    'asset_maintenance_report' => 'Rapport sur l\'entretien d\'actif',
+    'asset_maintenances'       => 'Entretien d\'actifs',
     'item'  				=> 'Item',
-    'last'					=> 'Last',
+    'last'					=> 'Dernier',
     'last_name'				=> 'Nom',
     'license'				=> 'Licence',
     'license_report'        => 'Rapport de licence',
     'licenses_available'	=> 'Licences disponibles',
     'licenses'				=> 'Licences',
     'list_all'				=> 'Lister tout',
-    'loading'				=> 'Loading',
-    'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'loading'				=> 'Chargement',
+    'lock_passwords'        => 'Ce champ ne peut pas être modifié dans cette installation.',
+    'feature_disabled'      => 'Cette option n\'est pas disponible pour cette installation.',
     'location'              => 'Lieu',
     'locations'				=> 'Lieux',
     'logout'				=> 'Se déconnecter',
@@ -84,36 +84,36 @@
     'months'				=> 'mois',
     'moreinfo'				=> 'Plus d\'info',
     'name'					=> 'Nom',
-    'next'					=> 'Next',
+    'next'					=> 'Prochain',
     'no_depreciation'		=> 'Pas d\'amortissement',
     'no_results'			=> 'Pas de résultat.',
     'no'  					=> 'Non',
     'notes'  				=> 'Notes',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Afficher_MENU_items',
+    'pagination_info'		=> 'Afficher_DEBUT_à_FIN_de_TOUS_items',
     'pending'				=> 'En Attente',
     'people'				=> 'Personnes',
     'per_page'				=> 'Résultats par page',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Précédent',
+    'processing'			=> 'En cours de traitement',
     'profile'				=> 'Votre profil',
-    'qty'		            => 'QTY',
-    'quanitity'		        => 'Quanitity',
+    'qty'		            => 'QTÉ',
+    'quanitity'		        => 'Quantité',
     'ready_to_deploy'		=> 'Prêt à être déployé',
-    'recent_activity'		=> 'Recent Activity',
+    'recent_activity'		=> 'Activité récente',
     'reports'				=> 'Rapports',
-    'requested'				=> 'Requested',
+    'requested'				=> 'Demandé',
     'save'  				=> 'Sauvegarder',
-    'select'				=> 'Select',
-    'search'				=> 'Search',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date',
-    'select_statuslabel'	=> 'Select Status',
+    'select'				=> 'Sélectionner',
+    'search'				=> 'Rechercher',
+    'select_depreciation'	=> 'Choisissez un type d\'amortissement',
+    'select_location'		=> 'Choisissez un emplacement',
+    'select_manufacturer'	=> 'Choisissez un fabricant',
+    'select_model'			=> 'Choisissez un modèle',
+    'select_supplier'		=> 'Choisissez un fournisseur',
+    'select_user'			=> 'Choisissez un utilisateur',
+    'select_date'			=> 'Choisissez une date',
+    'select_statuslabel'	=> 'Choisissez un état',
     'settings'				=> 'Préférences',
     'sign_in'				=> 'Connexion',
     'site_name'				=> 'Nom du Site',
@@ -123,16 +123,16 @@
     'suppliers'  			=> 'Fournisseurs',
     'total_assets'			=> 'actifs au total',
     'total_licenses'		=> 'licences au total',
-    'type'  				=> 'Type',
+    'type'  				=> 'Type ',
     'undeployable'			=> 'Non déployable',
     'unknown_admin'			=> 'Admin inconnu',
-    'update'                => 'Update',
-    'uploaded'              => 'Uploaded',
+    'update'                => 'Actualiser',
+    'uploaded'              => 'Téléversement réussi',
     'user'					=> 'Utilisateur',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
-    'users'                 => 'Users',
+    'accepted'			    => 'validé',
+    'declined'			    => 'refusé',
+    'unaccepted_asset_report' => 'Actifs refusés',
+    'users'                 => 'Utilisateurs',
     'viewassets'  			=> 'Voir les actifs associés',
     'website'               => 'Site web',
     'welcome'				=> 'Bienvenue, :name',

app/lang/fr/validation.php

@@ -77,7 +77,7 @@ return array(
     */
 
     'custom' => array(),
-    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+    'alpha_space' => "L'attribut \":attribute\" contient un caractère invalide.",
 
     /*
     |--------------------------------------------------------------------------

app/lang/hr/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/hu/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/it/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Sei sicuro di voler eliminare quest\'accessorio?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'C\'è stato un problema durante l\'eliminazione del consumabile. Prova di nuovo.',
-        'success' => 'L\'accessorio è stato eliminato con successo.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/ja/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'この付属品を本当に削除してもよいですか？',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => '消耗品の削除に失敗しました。もう一度試して下さい。',
-        'success' => '付属品の削除に成功しました。'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -22,7 +22,7 @@ return array(
     'eula_settings'				=> 'EULA設定',
     'eula_markdown'				=> 'この EULA は、<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>で、利用可能です。',
     'general_settings'			=> '全般設定',
-	'generate_backup'			=> 'Generate Backup',
+	'generate_backup'			=> 'バックアップを作成',
     'header_color'              => 'ヘッダーカラー',
     'info'                      => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。',
     'laravel'                   => 'Laravelバージョン',

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

@@ -8,10 +8,10 @@ return array(
         'success'               => '更新に成功しました。'
     ),
     'backup' => array(
-        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
-        'file_deleted'          => 'The backup file was successfully deleted. ',
-        'generated'             => 'A new backup file was successfully created.',
-        'file_not_found'        => 'That backup file could not be found on the server.',
+        'delete_confirm'        => 'このバックアップファイルを削除してもよろしいですか？この操作は、もとに戻すことは出来ません。 ',
+        'file_deleted'          => 'バックアップファイルの削除に成功しました。 ',
+        'generated'             => '新しいバックアップファイルが作成されました。',
+        'file_not_found'        => 'そのバックアップファイルをサーバー上に見つけることが出来ませんでした。',
     ),
 
 );

app/lang/ko/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => '이 부속품을 삭제하시겠습니까?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => '소모품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.',
-        'success' => '부속품이 삭제되었습니다.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/lt/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Ar jūs tikrai norite ištrinti šią suvartojamą įrangą?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'Nepavyko ištrinti suvartojamos įrangos. Prašome bandykite dar kartą.',
-        'success' => 'Ši įranga sėkmingai ištrinta.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/ms/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'Het accessoire is succesvol verwijderd.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

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

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Er du sikker på at du vil slette dette tilbehør?',
+        'confirm'   => 'Er du sikker på at forbruksmateriellet skal slettes?',
         'error'   => 'Noe gikk feil under sletting av forbruksvaren. Prøv igjen.',
-        'success' => 'Tilbehør ble slettet.'
+        'success' => 'Forbruksmateriell ble slettet.'
     ),
 
      'checkout' => array(

app/lang/pl/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Czy na pewno chcesz usunąć te akcesoria?',
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
         'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'Akcesoria usunięte pomyślnie.'
+        'success' => 'The consumable was deleted successfully.'
     ),
 
      'checkout' => array(

app/lang/pt-BR/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem certeza de que deseja excluir este acessório ?',
+        'confirm'   => 'Você realmente quer apagar este suprimento?',
         'error'   => 'Houve um problema ao excluir o consumível. Por favor, tente novamente.',
-        'success' => 'O acessório foi excluído com sucesso.'
+        'success' => 'O suprimento foi deletado com sucesso.'
     ),
 
      'checkout' => array(

app/lang/pt-BR/admin/settings/general.php

@@ -22,7 +22,7 @@ return array(
     'eula_settings'				=> 'Configuração do termo de uso',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'Configuracoes Gerais',
-	'generate_backup'			=> 'Generate Backup',
+	'generate_backup'			=> 'Backup Criado',
     'header_color'              => 'Cor do Cabeçalho',
     'info'                      => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.',
     'laravel'                   => 'Versão do Laravel',

app/lang/pt-BR/admin/settings/message.php

@@ -8,10 +8,10 @@ return array(
         'success'               => 'Configurações atualizadas com sucesso.'
     ),
     'backup' => array(
-        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
-        'file_deleted'          => 'The backup file was successfully deleted. ',
-        'generated'             => 'A new backup file was successfully created.',
-        'file_not_found'        => 'That backup file could not be found on the server.',
+        'delete_confirm'        => 'Você tem certeza que quer apagar este arquivo de backup? Esta ação não pode ser desfeita. ',
+        'file_deleted'          => 'O arquivo de backup foi apagado com sucesso. ',
+        'generated'             => 'Um novo arquivo de backup foi criado com sucesso.',
+        'file_not_found'        => 'Arquivo de backup não foi encontrado no servidor.',
     ),
 
 );

app/lang/pt-PT/admin/consumables/message.php

@@ -15,9 +15,9 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Tem a certeza que pretende remover este acessório?',
+        'confirm'   => 'Tem a certeza que deseja remover este consumível?',
         'error'   => 'Ocorreu um problema ao remover o consumível. Por favor, tente novamente.',
-        'success' => 'O acessório foi removido com sucesso.'
+        'success' => 'Consumível removido com sucesso.'
     ),
 
      'checkout' => array(

app/lang/pt-PT/admin/settings/general.php

@@ -11,7 +11,7 @@ return array(
 	'barcode_type'				=> 'Tipo de Código de Barras',
 	'barcode_settings'			=> 'Definições de Código de Barras',
 	'custom_css'				=> 'CSS Personalizado',
-	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
+	'custom_css_help'			=> 'Insira o CSS personalizado que deseja utilizar. Não use as tags <style></style>.',
 	'default_currency'  		=> 'Moeda padrão',
 	'default_eula_text'			=> 'EULA padrão',
 	'default_eula_help_text'	=> 'Também pode associar EULAs personalizados para categorias de artigos especificas.',
@@ -22,7 +22,7 @@ return array(
     'eula_settings'				=> 'Definições de EULA',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'general_settings'			=> 'Configurações Gerais',
-	'generate_backup'			=> 'Generate Backup',
+	'generate_backup'			=> 'Gerar Backup',
     'header_color'              => 'Cor do cabeçalho',
     'info'                      => 'Estas configurações permitem costumizar certos aspetos desta instalação.',
     'laravel'                   => 'Versão do Laravel',

app/lang/pt-PT/admin/settings/message.php

@@ -8,10 +8,10 @@ return array(
         'success'               => 'Configurações atualizadas com sucesso.'
     ),
     'backup' => array(
-        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
-        'file_deleted'          => 'The backup file was successfully deleted. ',
-        'generated'             => 'A new backup file was successfully created.',
-        'file_not_found'        => 'That backup file could not be found on the server.',
+        'delete_confirm'        => 'Tem a certeza que pretende eliminar o ficheiro de backup? Não poderá reverter a acção. ',
+        'file_deleted'          => 'Ficheiro de backup eliminado com sucesso. ',
+        'generated'             => 'Ficheiro de backup criado com sucesso.',
+        'file_not_found'        => 'O ficheiro de backup não foi encontrado no servidor.',
     ),
 
 );