Merge pull request #10264 from nuraeil/added-localized-strings

Added #10242: Improved localized strings

app/Http/Controllers/Api/PredefinedKitsController.php

@@ -88,7 +88,7 @@ class PredefinedKitsController extends Controller
         $kit->fill($request->all());
 
         if ($kit->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.update_success')));      // TODO: trans
+            return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.update_success')));
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, $kit->getErrors()));
@@ -113,7 +113,7 @@ class PredefinedKitsController extends Controller
 
         $kit->delete();
 
-        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/kits/general.delete_success')));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/kits/general.delete_success')));
     }
 
     /**
@@ -171,12 +171,12 @@ class PredefinedKitsController extends Controller
         $license_id = $request->get('license');
         $relation = $kit->licenses();
         if ($relation->find($license_id)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => 'License already attached to kit']));
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => trans('admin/kits/general.license_error')]));
         }
 
         $relation->attach($license_id, ['quantity' => $quantity]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License added successfull'));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.license_added_success')));
     }
 
     /**
@@ -196,7 +196,7 @@ class PredefinedKitsController extends Controller
         }
         $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' =>  $quantity]]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated'));  // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.license_updated')));
     }
 
     /**
@@ -274,7 +274,7 @@ class PredefinedKitsController extends Controller
         }
         $kit->models()->syncWithoutDetaching([$model_id => ['quantity' =>  $quantity]]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated'));  // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.license_updated')));
     }
 
     /**
@@ -327,12 +327,12 @@ class PredefinedKitsController extends Controller
         $consumable_id = $request->get('consumable');
         $relation = $kit->consumables();
         if ($relation->find($consumable_id)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => 'Consumable already attached to kit']));
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => trans('admin/kits/general.consumable_error')]));
         }
 
         $relation->attach($consumable_id, ['quantity' => $quantity]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable added successfull'));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.consumable_added_success')));
     }
 
     /**
@@ -352,7 +352,7 @@ class PredefinedKitsController extends Controller
         }
         $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' =>  $quantity]]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable updated'));  // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.consumable_updated')));
     }
 
     /**
@@ -368,7 +368,7 @@ class PredefinedKitsController extends Controller
 
         $kit->consumables()->detach($consumable_id);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull'));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.consumable_deleted')));
     }
 
     /**
@@ -405,12 +405,12 @@ class PredefinedKitsController extends Controller
         $accessory_id = $request->get('accessory');
         $relation = $kit->accessories();
         if ($relation->find($accessory_id)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => 'Accessory already attached to kit']));
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => trans('admin/kits/general.accessory_error')]));
         }
 
         $relation->attach($accessory_id, ['quantity' => $quantity]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory added successfull'));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.accessory_added_success')));
     }
 
     /**
@@ -430,7 +430,7 @@ class PredefinedKitsController extends Controller
         }
         $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' =>  $quantity]]);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory updated'));  // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.accessory_updated')));
     }
 
     /**
@@ -446,6 +446,6 @@ class PredefinedKitsController extends Controller
 
         $kit->accessories()->detach($accessory_id);
 
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull'));     // TODO: trans
+        return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.accessory_deleted')));
     }
 }

app/Http/Controllers/Kits/CheckoutKitController.php

@@ -61,12 +61,12 @@ class CheckoutKitController extends Controller
 
         $checkout_result = $this->kitService->checkout($request, $kit, $user);
         if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0) {
-            return redirect()->back()->with('error', 'Checkout error')->with('error_messages', $checkout_result['errors']);  // TODO: trans
+            return redirect()->back()->with('error', trans('general.checkout_error'))->with('error_messages', $checkout_result['errors']);
         }
 
-        return redirect()->back()->with('success', 'Checkout was successful')
+        return redirect()->back()->with('success', trans('general.checkout_success'))
             ->with('assets', Arr::get($checkout_result, 'assets', null))
             ->with('accessories', Arr::get($checkout_result, 'accessories', null))
-            ->with('consumables', Arr::get($checkout_result, 'consumables', null));                                   // TODO: trans
+            ->with('consumables', Arr::get($checkout_result, 'consumables', null));
     }
 }

app/Http/Controllers/Kits/PredefinedKitsController.php

@@ -64,7 +64,7 @@ class PredefinedKitsController extends Controller
             return redirect()->back()->withInput()->withErrors($kit->getErrors());
         }
 
-        return redirect()->route('kits.index')->with('success', 'Kit was successfully created.'); // TODO: trans()
+        return redirect()->route('kits.index')->with('success', trans('admin/kits/general.kit_created'));
     }
 
     /**
@@ -85,7 +85,7 @@ class PredefinedKitsController extends Controller
                 ->with('licenses', $kit->licenses);
         }
 
-        return redirect()->route('kits.index')->with('error', 'Kit does not exist');        // TODO: trans
+        return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
     }
 
     /**
@@ -103,13 +103,13 @@ class PredefinedKitsController extends Controller
         // Check if the kit exists
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         $kit->name = $request->input('name');
 
         if ($kit->save()) {
-            return redirect()->route('kits.index')->with('success', 'Kit was successfully updated');        // TODO: trans
+            return redirect()->route('kits.index')->with('success', trans('admin/kits/general.kit_updated'));
         }
 
         return redirect()->back()->withInput()->withErrors($kit->getErrors());
@@ -129,7 +129,7 @@ class PredefinedKitsController extends Controller
         $this->authorize('delete', PredefinedKit::class);
         // Check if the kit exists
         if (is_null($kit = PredefinedKit::find($kit_id))) {
-            return redirect()->route('kits.index')->with('error', 'Kit not found');     // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_not_found'));
         }
 
         // Delete childs
@@ -141,7 +141,7 @@ class PredefinedKitsController extends Controller
         $kit->delete();
 
         // Redirect to the kit management page
-        return redirect()->route('kits.index')->with('success', 'Kit was successfully deleted'); // TODO: trans
+        return redirect()->route('kits.index')->with('success', trans('admin/kits/general.kit_deleted'));
     }
 
     /**
@@ -176,7 +176,7 @@ class PredefinedKitsController extends Controller
             ]);
         }
 
-        return redirect()->route('kits.index')->with('error', 'Kit does not exist');        // TODO: trans
+        return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
     }
 
     /**
@@ -191,7 +191,7 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         $validator = \Validator::make($request->all(), $kit->makeModelRules($model_id));
@@ -206,7 +206,7 @@ class PredefinedKitsController extends Controller
         $pivot->quantity = $request->input('quantity');
         $pivot->save();
 
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Model updated successfully.');     // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.kit_model_updated'));
     }
 
     /**
@@ -221,14 +221,14 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         // Delete childs
         $kit->models()->detach($model_id);
 
         // Redirect to the kit management page
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Model was successfully detached'); // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.kit_model_detached'));
     }
 
     /**
@@ -243,10 +243,10 @@ class PredefinedKitsController extends Controller
     {
         $this->authorize('update', PredefinedKit::class);
         if (! ($kit = PredefinedKit::find($kit_id))) {
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
         if (! ($license = $kit->licenses()->find($license_id))) {
-            return redirect()->route('kits.index')->with('error', 'License does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.license_none'));
         }
 
         return view('kits/license-edit', [
@@ -269,7 +269,7 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         $validator = \Validator::make($request->all(), $kit->makeLicenseRules($license_id));
@@ -284,7 +284,7 @@ class PredefinedKitsController extends Controller
         $pivot->quantity = $request->input('quantity');
         $pivot->save();
 
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'License updated successfully.');     // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.license_updated'));
     }
 
     /**
@@ -300,14 +300,14 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         // Delete childs
         $kit->licenses()->detach($license_id);
 
         // Redirect to the kit management page
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'License was successfully detached'); // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.license_detached'));
     }
 
     /**
@@ -322,10 +322,10 @@ class PredefinedKitsController extends Controller
     {
         $this->authorize('update', PredefinedKit::class);
         if (! ($kit = PredefinedKit::find($kit_id))) {
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
         if (! ($accessory = $kit->accessories()->find($accessory_id))) {
-            return redirect()->route('kits.index')->with('error', 'Accessory does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.accessory_none'));
         }
 
         return view('kits/accessory-edit', [
@@ -348,7 +348,7 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         $validator = \Validator::make($request->all(), $kit->makeAccessoryRules($accessory_id));
@@ -363,7 +363,7 @@ class PredefinedKitsController extends Controller
         $pivot->quantity = $request->input('quantity');
         $pivot->save();
 
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Accessory updated successfully.');     // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.accessory_updated'));
     }
 
     /**
@@ -378,14 +378,14 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         // Delete childs
         $kit->accessories()->detach($accessory_id);
 
         // Redirect to the kit management page
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Accessory was successfully detached'); // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.accessory_detached'));
     }
 
     /**
@@ -400,10 +400,10 @@ class PredefinedKitsController extends Controller
     {
         $this->authorize('update', PredefinedKit::class);
         if (! ($kit = PredefinedKit::find($kit_id))) {
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
         if (! ($consumable = $kit->consumables()->find($consumable_id))) {
-            return redirect()->route('kits.index')->with('error', 'Consumable does not exist');        // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.consumable_none'));
         }
 
         return view('kits/consumable-edit', [
@@ -426,7 +426,7 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         $validator = \Validator::make($request->all(), $kit->makeConsumableRules($consumable_id));
@@ -441,7 +441,7 @@ class PredefinedKitsController extends Controller
         $pivot->quantity = $request->input('quantity');
         $pivot->save();
 
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Consumable updated successfully.');     // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.consumable_updated'));
     }
 
     /**
@@ -456,13 +456,13 @@ class PredefinedKitsController extends Controller
         $this->authorize('update', PredefinedKit::class);
         if (is_null($kit = PredefinedKit::find($kit_id))) {
             // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', 'Kit does not exist');      // TODO: trans
+            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
         }
 
         // Delete childs
         $kit->consumables()->detach($consumable_id);
 
         // Redirect to the kit management page
-        return redirect()->route('kits.edit', $kit_id)->with('success', 'Consumable was successfully detached'); // TODO: trans
+        return redirect()->route('kits.edit', $kit_id)->with('success', trans('admin/kits/general.consumable_detached'));
     }
 }

app/Http/Controllers/Users/UsersController.php

@@ -529,7 +529,7 @@ class UsersController extends Controller
                         strtolower(trans('general.id')),
                         trans('admin/companies/table.title'),
                         trans('admin/users/table.title'),
-                        trans('admin/users/table.employee_num'),
+                        trans('general.employee_number'),
                         trans('admin/users/table.name'),
                         trans('admin/users/table.username'),
                         trans('admin/users/table.email'),

app/Presenters/AssetPresenter.php

@@ -102,7 +102,7 @@ class AssetPresenter extends Presenter
                 'field' => 'employee_number',
                 'searchable' => false,
                 'sortable' => false,
-                'title' => trans('admin/users/table.employee_num'),
+                'title' => trans('general.employee_number'),
                 'visible' => false,
                 'formatter' => 'employeeNumFormatter',
             ], [

app/Presenters/PredefinedKitPresenter.php

@@ -25,7 +25,7 @@ class PredefinedKitPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => 'Name',                      // TODO: trans
+                'title' => trans('general.name'),
                 'formatter' => 'kitsLinkFormatter',
             ],
         ];
@@ -84,13 +84,13 @@ class PredefinedKitPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => 'Name',                      // TODO: trans
+                'title' => trans('general.name'),
                 'formatter' => 'modelsLinkFormatter',
             ], [
                 'field' => 'quantity',
                 'searchable' => false,
                 'sortable' => false,
-                'title' => 'Quantity',                      // TODO: trans
+                'title' => trans('general.quantity'),
             ], [
                 'field' => 'actions',
                 'searchable' => false,
@@ -136,13 +136,13 @@ class PredefinedKitPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => 'Name',                      // TODO: trans
+                'title' => trans('general.name'),
                 'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'quantity',
                 'searchable' => false,
                 'sortable' => false,
-                'title' => 'Quantity',                      // TODO: trans
+                'title' => trans('general.quantity'),
             ], [
                 'field' => 'actions',
                 'searchable' => false,
@@ -188,13 +188,13 @@ class PredefinedKitPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => 'Name',                      // TODO: trans
+                'title' => trans('general.name'),
                 'formatter' => 'accessoriesLinkFormatter',
             ], [
                 'field' => 'quantity',
                 'searchable' => false,
                 'sortable' => false,
-                'title' => 'Quantity',                      // TODO: trans
+                'title' => trans('general.quantity'),
             ], [
                 'field' => 'actions',
                 'searchable' => false,
@@ -240,13 +240,13 @@ class PredefinedKitPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'title' => 'Name',                      // TODO: trans
+                'title' => trans('general.name'),
                 'formatter' => 'consumablesLinkFormatter',
             ], [
                 'field' => 'quantity',
                 'searchable' => false,
                 'sortable' => false,
-                'title' => 'Quantity',                      // TODO: trans
+                'title' => trans('general.quantity'),
             ], [
                 'field' => 'actions',
                 'searchable' => false,

app/Presenters/UserPresenter.php

@@ -157,7 +157,7 @@ class UserPresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => trans('admin/users/table.employee_num'),
+                'title' => trans('general.employee_number'),
                 'visible' => false,
             ],
             [

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=c015308b9685c9375c71",
+    "/js/build/app.js": "/js/build/app.js?id=53b8d5c2b746ea8777a7",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc",
     "/css/build/overrides.css": "/css/build/overrides.css?id=4fc3a0e0a16964643e70",
     "/css/build/app.css": "/css/build/app.css?id=a7cd7ad6e0e053ccf443",
@@ -18,15 +18,15 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723",
-    "/css/dist/all.css": "/css/dist/all.css?id=2ee76a9bb4100b60febc",
+    "/css/dist/all.css": "/css/dist/all.css?id=97ea7f220e05bd2c1d46",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
-    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
+    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6e35c74c14f89f55df49",
-    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
+    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6e35c74c14f89f55df49",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=b717ba4eb48e4ce62615",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7058545374c5c6a6a881",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=d6794066f6af00743d5f",
-    "/js/dist/all.js": "/js/dist/all.js?id=b12eaebad0af2541f40b",
+    "/js/dist/all.js": "/js/dist/all.js?id=e3ee59aad9b5feb67315",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6e35fb4cb2f1063b3047",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133",

resources/lang/en/account/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'personal_api_keys' => 'Personal API Keys',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
+                    will not be visible to you again.',
+    'api_base_url' => 'Your API base url is located at:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API tokens are set to expire in:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
+                    find specific API endpoints and additional API documentation.',
+];

resources/lang/en/admin/companies/general.php

@@ -2,4 +2,6 @@
 
 return [
     'select_company' => 'Select Company',
+    'about_companies' => 'About Companies',
+    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
 ];

resources/lang/en/admin/custom_fields/general.php

@@ -2,6 +2,7 @@
 
 return [
     'custom_fields'		        => 'Custom Fields',
+    'manage'                    => 'Manage',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
     'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
@@ -26,7 +27,19 @@ return [
     'used_by_models'   		    => 'Used By Models',
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
+    'create_fieldset_title' => 'Create a new fieldset',
     'create_field'            => 'New Custom Field',
+    'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
+    'help_text' => 'Help Text',
+    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'about_custom_fields_title' => 'About Custom Fields',
+    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
+    'add_field_to_fieldset' => 'Add Field to Fieldset',
+    'make_optional' => 'Required - click to make optional',
+    'make_required' => 'Optional - click to make required',
+    'reorder' => 'Reorder',
+    'db_field' => 'DB Field',
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
 ];

resources/lang/en/admin/depreciations/general.php

@@ -9,6 +9,8 @@ return [
     'depreciation_min'                      => 'Floor Value of Depreciation',
     'number_of_months'  					=> 'Number of Months',
     'update'  					            => 'Update Depreciation',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Minimum Value after Depreciation',
-
+    'no_depreciations_warning'               => '<strong>Warning: </strong>
+                      You do not currently have any depreciations set up.
+                      Please set up at least one depreciation to view the depreciation report.',
 ];

resources/lang/en/admin/groups/titles.php

@@ -10,5 +10,7 @@ return [
     'group_admin' 	 		=> 'Group Admin',
     'allow' 	 			=> 'Allow',
     'deny' 	 				=> 'Deny',
-
+    'permission'            => 'Permission',
+    'grant'                 => 'Grant',
+    'no_permissions'        => 'This group has no permissions.'
 ];

resources/lang/en/admin/hardware/form.php

@@ -40,4 +40,10 @@ return [
     'warranty'			=> 'Warranty',
         'warranty_expires'		=> 'Warranty Expires',
     'years'				=> 'years',
+    'asset_location' => 'Update Asset Location',
+    'asset_location_update_default_current' => 'Update default location AND actual location',
+    'asset_location_update_default' => 'Update only default location',
+    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
+    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'processing_spinner' => 'Processing...',
 ];

resources/lang/en/admin/hardware/general.php

@@ -15,8 +15,29 @@ return [
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',
+    'not_requestable'           => 'Not Requestable',
+    'requestable_status_warning' => 'Do not change  requestable status',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',
     'view'  					=> 'View Asset',
+    'csv_error' => 'You have an error in your CSV file:',
+    'import_text' => '
+    <p>
+    Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &gt; General Settings.
+    </p>
+
+    <p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p>
+
+    <p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
+    ',
+    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
+    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
+    'csv_import_match_first' => 'Try to match users by first name (jane) format',
+    'csv_import_match_email' => 'Try to match users by email as username',
+    'csv_import_match_username' => 'Try to match users by username',
+    'error_messages' => 'Error messages:',
+    'success_messages' => 'Success messages:',
+    'alert_details' => 'Please see below for details.',
+    'custom_export' => 'Custom Export'
 ];

resources/lang/en/admin/hardware/table.php

@@ -19,8 +19,12 @@ return [
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
-    'image'		=> 'Device Image',
+    'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-
+    'assigned_to'    => 'Assigned To',
+    'requesting_user' => 'Requesting User',
+    'requested_date' => 'Requested Date',
+    'changed'       => 'Changed',
+    'icon' => 'Icon',
 ];

resources/lang/en/admin/importer/button.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+
+    'process' => 'Process',
+];

resources/lang/en/admin/importer/general.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'select_import_file'   	=> 'Select Import File...',
+    'select_file' => 'Select file'
+];

resources/lang/en/admin/importer/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+
+    'file' => 'File',
+    'created' => 'Created',
+    'size' => 'Size',
+    'process' => 'Process',
+    'delete' => 'Delete',
+];

resources/lang/en/admin/kits/general.php

@@ -13,5 +13,38 @@ return [
     'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
     'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
     'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
-
+    'append_accessory'                  => 'Append Accessory',
+    'update_appended_accessory'         => 'Update appended Accessory',
+    'append_consumable'                 => 'Append Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
+    'append_license'                    => 'Append license',
+    'update_appended_license'           => 'Update appended license',
+    'append_model'                      => 'Append model',
+    'update_appended_model'             => 'Update appended model',
+    'license_error'                     => 'License already attached to kit',
+    'license_added_success'             => 'License added successfully',
+    'license_updated'                   => 'License was successfully updated',
+    'license_none'                      => 'License does not exist',
+    'license_detached'                  => 'License was successfully detached',
+    'consumable_added_success'          => 'Consumable added successfully',
+    'consumable_updated'                => 'Consumable was successfully updated',
+    'consumable_error'                  => 'Consumable already attached to kit',
+    'consumable_deleted'                => 'Delete was successful',
+    'consumable_none'                   => 'Consumable does not exist',
+    'consumable_detached'               => 'Consumable was successfully detached',
+    'accessory_added_success'           => 'Accessory added successfully',
+    'accessory_updated'                 => 'Accessory was successfully updated',
+    'accessory_detached'                => 'Accessory was successfully detached',
+    'accessory_error'                   => 'Accessory already attached to kit',
+    'accessory_deleted'                 => 'Delete was successful',
+    'accessory_none'                    => 'Accessory does not exist',
+    'checkout_success'                  => 'Checkout was successful',
+    'checkout_error'                    => 'Checkout error',
+    'kit_none'                          => 'Kit does not exist',
+    'kit_created'                       => 'Kit was successfully created',
+    'kit_updated'                       => 'Kit was successfully updated',
+    'kit_not_found'                     => 'Kit not found',
+    'kit_deleted'                       => 'Kit was successfully deleted',
+    'kit_model_updated'                 => 'Model was successfully updated',
+    'kit_model_detached'                => 'Model was successfully detached',
 ];

resources/lang/en/admin/locations/general.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'assigned_location' 	                => 'Assigned to :location Location',
+    'asset_management_system' => 'Asset Management System',
+    'assigned_to' => 'Assigned To:',
+    'manager' => 'Manager',
+    'date' => 'Current Date:',
+];

resources/lang/en/admin/locations/table.php

@@ -20,4 +20,21 @@ return [
     'parent'                    => 'Parent',
     'currency'                  => 'Location Currency',
     'ldap_ou'                   => 'LDAP Search OU',
-    ];
+    'user_name'                 => 'User Name',
+    'department'                => 'Department',
+    'location'                  => 'Location',
+    'asset_tag'                 => 'Assets Tag',
+    'asset_name'                => 'Name',
+    'asset_category'            => 'Category',
+    'asset_manufacturer'        => 'Manufacturer',
+    'asset_model'               => 'Model',
+    'asset_serial'              => 'Serial',
+    'asset_location'            => 'Location',
+    'asset_checked_out'         => 'Checked Out',
+    'asset_expected_checkin'    => 'Expected Checkin',
+    'date'                      => 'Date:',
+    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
+];

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

@@ -10,7 +10,10 @@ return [
     'admin_cc_email'            => 'CC Email',
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
+    'alerts'                	=> 'Alerts',
+    'alert_title'               => 'Update Alert Settings',
     'alert_email'				=> 'Send alerts to',
+    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -61,12 +64,17 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
+    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
+    'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
+    'ldap'                      => 'LDAP',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
@@ -101,9 +109,17 @@ return [
     'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
-    'license'                  => 'Software License',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'license'                   => 'Software License',
     'load_remote_text'          => 'Remote Scripts',
     'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login'                     => 'Login Attempts',
+    'login_attempt'             => 'Login Attempt',
+    'login_ip'                  => 'IP Address',
+    'login_success'             => 'Success?',
+    'login_user_agent'          => 'User Agent',
+    'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
@@ -124,16 +140,28 @@ return [
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
+    'php_info'                  => 'PHP Info',
+    'php_overview'              => 'PHP',
+    'php_overview_keywords'     => 'phpinfo, system, info',
+    'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
     'pwd_secure_complexity'     => 'Password Complexity',
     'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
+    'pwd_secure_complexity_letters' => 'Require at least one letter',
+    'pwd_secure_complexity_numbers' => 'Require at least one number',
+    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
     'pwd_secure_min'            => 'Password minimum characters',
     'pwd_secure_min_help'       => 'Minimum permitted value is 8',
     'pwd_secure_uncommon'       => 'Prevent common passwords',
     'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
     'qr_help'                   => 'Enable QR Codes first to set this',
     'qr_text'                   => 'QR Code Text',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Update SAML settings',
+    'saml_help'                 => 'SAML settings',
     'saml_enabled'              => 'SAML enabled',
     'saml_integration'          => 'SAML Integration',
     'saml_sp_entityid'          => 'Entity ID',
@@ -153,6 +181,7 @@ return [
     'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
     'saml_custom_settings'      => 'SAML Custom Settings',
     'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_download'             => 'Download Metadata',
     'setting'                   => 'Setting',
     'settings'                  => 'Settings',
     'show_alerts_in_menu'       => 'Show alerts in top menu',
@@ -163,6 +192,9 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'slack'                     => 'Slack',
+    'slack_title'               => 'Update Slack Settings',
+    'slack_help'                => 'Slack settings',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',
     'slack_endpoint'            => 'Slack Endpoint',
@@ -179,6 +211,8 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
+    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
+    'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
     'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
@@ -190,6 +224,7 @@ return [
     'privacy_policy'            => 'Privacy Policy',
     'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
     'purge'                     => 'Purge Deleted Records',
+    'purge_deleted'             => 'Purge Deleted ',
     'labels_display_bgutter'    => 'Label bottom gutter',
     'labels_display_sgutter'    => 'Label side gutter',
     'labels_fontsize'           => 'Label font size',
@@ -235,4 +270,51 @@ return [
     'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
     'zerofill_count'        => 'Length of asset tags, including zerofill',
     'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'oauth_title' => 'OAuth API Settings',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endpoint Settings',
+    'asset_tag_title' => 'Update Asset Tag Settings',
+    'barcode_title' => 'Update Barcode Settings',
+    'barcodes' => 'Barcodes',
+    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'branding_title' => 'Update Branding Settings',
+    'general_title' => 'Update General Settings',
+    'mail_test' => 'Send Test',
+    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'filter_by_keyword' => 'Filter by setting keyword',
+    'security' => 'Security',
+    'security_title' => 'Update Security Settings',
+    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    'security_help' => 'Two-factor, Password Restrictions',
+    'groups_keywords' => 'permissions, permission groups, authorization',
+    'groups_help' => 'Account permission groups',
+    'localization' => 'Localization',
+    'localization_title' => 'Update Localization Settings',
+    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'localization_help' => 'Language, date display',
+    'notifications' => 'Notifications',
+    'notifications_help' => 'Email alerts, audit settings',
+    'asset_tags_help' => 'Incrementing and prefixes',
+    'labels' => 'Labels',
+    'labels_title' => 'Update Label Settings',
+    'labels_help' => 'Label sizes &amp; settings',
+    'purge' => 'Purge',
+    'purge_keywords' => 'permanently delete',
+    'purge_help' => 'Purge Deleted Records',
+    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_ad' => 'LDAP/AD',
+    'employee_number' => 'Employee Number',
+    'create_admin_user' => 'Create a User ::',
+    'create_admin_success' => 'Success! Your admin user has been added!',
+    'create_admin_redirect' => 'Click here to go to your app login!',
+    'setup_migrations' => 'Database Migrations ::',
+    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'ldap_settings_link' => 'LDAP Settings Page',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
 ];

resources/lang/en/admin/settings/message.php

@@ -11,11 +11,33 @@ return [
         '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.',
+        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
+        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
         'success'               => 'Deleted records successfully purged.',
     ],
-
+    'mail' => [
+        'sending' => 'Sending Test Email...',
+        'success' => 'Mail sent!',
+        'error' => 'Mail could not be sent.',
+        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+    ],
+    'ldap' => [
+        'testing' => 'Testing LDAP Connection, Binding & Query ...',
+        '500' => '500 Server Error. Please check your server logs for more information.',
+        'error' => 'Something went wrong :(',
+        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
+        'testing_authentication' => 'Testing LDAP Authentication...',
+        'authentication_success' => 'User authenticated against LDAP successfully!'
+    ],
+    'slack' => [
+        'sending' => 'Sending Slack test message...',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong.',
+    ]
 ];

resources/lang/en/admin/settings/table.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'created'   => 'Created',
+    'size' => 'Size',
+];

resources/lang/en/admin/users/general.php

@@ -22,6 +22,16 @@ return [
     'view_user'         => 'View User :name',
     'usercsv'           => 'CSV file',
     'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
-    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_enrolled' => '2FA Device Enrolled',
-    'two_factor_active'   => '2FA Active ',
+    'two_factor_active'   => '2FA Active',
-    ];
+    'user_deactivated'  => 'User is de-activated',
+    'activation_status_warning' => 'Do not change activation status',
+    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
+    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
+    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'remove_group_memberships' => 'Remove Group Memberships',
+    'warning_deletion' => 'WARNING:',
+    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'update_user_asssets_status' => 'Update all assets for these users to this status',
+    'checkin_user_properties' => 'Check in all properties associated with these users',
+];

resources/lang/en/admin/users/table.php

@@ -8,7 +8,6 @@ return [
     'createuser' 			=> 'Create User',
     'deny'  				=> 'Deny',
     'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
     'first_name' 			=> 'First Name',
     'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
     'id'         			=> 'Id',

resources/lang/en/button.php

@@ -8,11 +8,17 @@ return [
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
     'restore' 	                => 'Restore',
+    'remove'                    => 'Remove',
     'request'                   => 'Request',
     'submit'  	                => 'Submit',
     'upload'                    => 'Upload',
     'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
-    'send_password_link'       => 'Send Password Reset Link',
+    'send_password_link'        => 'Send Password Reset Link',
+    'go'                        => 'Go',
+    'bulk_actions'              => 'Bulk Actions',
+    'add_maintenance'           => 'Add Maintenance',
+    'append'                    => 'Append',
+    'new'                       => 'New',
 ];

resources/lang/en/general.php

@@ -19,7 +19,10 @@
     'asset'					=> 'Asset',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
+    'asset_tags'            => 'Asset Tags',
+    'assets_available'		=> 'Assets available',
+    'accept_assets'         => 'Accept Assets :name',
+    'accept_assets_menu'    => 'Accept Assets',
     'audit'				    => 'Audit',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
@@ -30,6 +33,10 @@
     'bulkaudit'             => 'Bulk Audit',
     'bulkaudit_status'      => 'Audit Status',
     'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_edit'             => 'Bulk Edit',
+    'bulk_delete'           => 'Bulk Delete',
+    'bulk_actions'          => 'Bulk Actions',
+    'bulk_checkin_delete'   => 'Bulk Checkin & Delete',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
@@ -62,6 +69,8 @@
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Current',
+    'current_password'      => 'Current Password',
+    'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
     'days'      			=> 'days',
@@ -75,13 +84,14 @@
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
     'departments'           => 'Departments',
-    'department'           => 'Department',
+    'department'            => 'Department',
     'deployed'				=> 'Deployed',
+    'depreciation'			=> 'Depreciation',
+    'depreciations'         => 'Depreciations',
     'depreciation_report'	=> 'Depreciation Report',
     'details'               => 'Details',
     'download'				=> 'Download',
-    'download_all'				=> 'Download All',
+    'download_all'		    => 'Download All',
-    'depreciation'			=> 'Depreciation',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
@@ -103,10 +113,13 @@
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
     'file_uploads'			=> 'File Uploads',
+    'file_upload'           => 'File Upload',
     'generate'				=> 'Generate',
-     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'generate_labels'       => 'Generate Labels',
+    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groups',
     'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
     'history'  			    => 'History',
     'history_for'  			=> 'History for',
     'id'  					=> 'ID',
@@ -124,6 +137,7 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
+    'item_name'             => 'Item Name',
     'insufficient_permissions' => 'Insufficient permissions!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Language',
@@ -144,6 +158,7 @@
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
+    'manage_api_keys'       => 'Manage API Keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -153,6 +168,7 @@
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
     'last_audit'		    => 'Last Audit',
@@ -174,19 +190,26 @@
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
+    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
     'ready_to_deploy'		=> 'Ready to Deploy',
     'recent_activity'		=> 'Recent Activity',
+    'remaining'             => 'Remaining',
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
     'restore'				=> 'Restore',
+    'requestable_models'    => 'Requestable Models',
     'requested'				=> 'Requested',
+    'requested_date'        => 'Requested Date',
+    'requested_assets'      => 'Requested Assets',
+    'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
+    'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_department'       => 'Select a Department',
+    'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
     'select_manufacturer'	=> 'Select a Manufacturer',
@@ -203,6 +226,7 @@
     'sign_in'				=> 'Sign in',
     'signature'             => 'Signature',
     'skin'       			=> 'Skin',
+    'slack_msg_note'        => 'A slack message will be sent',
     'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
@@ -214,6 +238,7 @@
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
+    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -233,6 +258,7 @@
     'users'                 => 'Users',
     'viewall'				=> 'View All',
     'viewassets'  			=> 'View Assigned Assets',
+    'viewassetsfor'         => 'View Assets for :name',
     'website'               => 'Website',
     'welcome'				=> 'Welcome, :name',
     'years'					=> 'years',
@@ -246,10 +272,78 @@
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
     'i_decline'             => 'I decline',
+    'accept_decline'        => 'Accept/Decline',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
     'clear_signature'       => 'Clear Signature',
     'show_help'             => 'Show help',
     'hide_help'             => 'Hide help',
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
-    ];
+    'email'                 => 'Email',
+    'do_not_change'         => 'Do Not Change',
+    'bug_report'            => 'Report a Bug',
+    'user_manual'           => 'User\'s Manual',
+    'setup_step_1'          => 'Step 1',
+    'setup_step_2'          => 'Step 2',
+    'setup_step_3'          => 'Step 3',
+    'setup_step_4'          => 'Step 4',
+    'setup_config_check'    => 'Configuration Check',
+    'setup_create_database' => 'Create Database Tables',
+    'setup_create_admin'    => 'Create Admin User',
+    'setup_done'            => 'Finished!',
+    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'checked_out'           => 'Checked Out',
+    'checked_out_to'        => 'Checked out to',
+    'fields'                => 'Fields',
+    'last_checkout'         => 'Last Checkout',
+    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
+    'expected_checkin'      => 'Expected Checkin',
+    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'changed'               => 'Changed',
+    'to'                    => 'To',
+    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
+    'range'                 => 'Range',
+    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'improvements'          => 'Improvements',
+    'information'           => 'Information',
+    'permissions'           => 'Permissions',
+    'managed_ldap'          => '(Managed via LDAP)',
+    'export'                => 'Export',
+    'ldap_sync'             => 'LDAP Sync',
+    'ldap_user_sync'        => 'LDAP User Sync',
+    'synchronize'           => 'Synchronize',
+    'sync_results'          => 'Synchronization Results',
+    'license_serial'        => 'Serial/Product Key',
+    'invalid_category'      => 'Invalid category',
+    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
+    '60_percent_warning'    => '60% Complete (warning)',
+    'dashboard_empty'       => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
+    'new_asset'             => 'New Asset',
+    'new_license'           => 'New License',
+    'new_accessory'         => 'New Accessory',
+    'new_consumable'        => 'New Consumable',
+    'collapse'              => 'Collapse',
+    'assigned'              => 'Assigned',
+    'asset_count'           => 'Asset Count',
+    'accessories_count'     => 'Accessories Count',
+    'consumables_count'     => 'Consumables Count',
+    'components_count'      => 'Components Count',
+    'licenses_count'        => 'Licenses Count',
+    'notification_error'    => 'Error:',
+    'notification_error_hint' => 'Please check the form below for errors',
+    'notification_success'  => 'Success:',
+    'notification_warning'   => 'Warning:',
+    'notification_info'      => 'Info:',
+    'asset_information'     => 'Asset Information',
+    'model_name'            => 'Model Name:',
+    'asset_name'            => 'Asset Name:',
+    'consumable_information' => 'Consumable Information:',
+    'consumable_name'       => 'Consumable Name:',
+    'accessory_information' => 'Accessory Information:',
+    'accessory_name'       => 'Accessory Name:',
+    'clone_item'            => 'Clone Item',
+    'checkout_tooltip' => 'Check this item out',
+    'checkin_tooltip' => 'Check this item in',
+    'checkout_user_tooltip' => 'Check this item out to a user',
+];

resources/lang/en/partials/forms/general.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'alt_uploaded_image_thumbnail' 	                => 'Uploaded image thumbnail',
+    'placeholder_kit'                               => 'Select a kit',
+];

resources/lang/en/table.php

@@ -6,5 +6,4 @@ return [
     'action' 		=> 'Action',
     'by'      		=> 'By',
     'item' 			=> 'Item',
-
 ];

resources/views/account/accept-asset.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    {{trans('general.accept', ['asset' => $item->present()->name()])}}
+    {{ trans('general.accept', ['asset' => $item->present()->name()]) }}
     @parent
 @stop
 

resources/views/account/accept/create.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Accept {{ $acceptance->checkoutable->present()->name() }}
+    {{ trans('general.accept', array('asset' => $acceptance->checkoutable->present()->name())) }}
     @parent
 @stop
 
@@ -47,14 +47,14 @@
             <div class="radio">
               <label>
                 <input type="radio" name="asset_acceptance" id="accepted" value="accepted">
-                I accept
+                {{ trans('general.i_accept') }}
               </label>
             </div>
 
             <div class="radio">
               <label>
                 <input type="radio" name="asset_acceptance" id="declined" value="declined">
-                I decline
+                {{ trans('general.i_decline') }}
               </label>
             </div>
 
@@ -69,7 +69,7 @@
             @if ($snipeSettings->require_accept_signature=='1')
             <div class="col-md-12 col-sm-12 text-center" style="padding-top: 20px">
 
-              <h3>Sign below to indicate that you agree to the terms of service:</h3>
+              <h3>{{ trans('general.sign_tos') }}</h3>
 
               <div id="signature-pad" class="m-signature-pad">
                 <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
@@ -77,7 +77,7 @@
                     <input type="hidden" name="signature_output" id="signature_output">
                 </div>
                <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
-                  <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">Clear Signature</button>
+                  <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{ trans('general.clear_signature') }}</button>
                 </div>
               </div>
             </div> <!-- .col-md-12.text-center-->

resources/views/account/accept/index.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Accept assets  {{ $user->present()->fullName() }}
+{{ trans('general.accept_assets', array('name' => $user->present()->fullName())) }}
 @parent
 @stop
 
@@ -34,15 +34,15 @@ Accept assets  {{ $user->present()->fullName() }}
                   }'>
             <thead>
               <tr>
-                <th>Name</th>
+                <th>{{ trans('general.name')}}</th>
-                <th>Actions</th>
+                <th>{{ trans('table.actions')}}</th>
               </tr>
             </thead>
             <tbody>
               @foreach ($acceptances as $acceptance)
               <tr>
                 <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
-                <td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">Accept/Decline</a></td>
+                <td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">{{ trans('general.accept_decline') }}</a></td>
               </tr>
               @endforeach
             </tbody>

resources/views/account/api.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Personal API Keys
+    {{ trans('account/general.personal_api_keys') }}
     @parent
 @stop
 
@@ -24,18 +24,17 @@
             </div>
             <div class="col-md-4">
                 <div class="alert alert-warning"><i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-                    When generating an API token, be sure to copy it down immediately as they
+                    {{ trans('account/general.api_key_warning') }}
-                    will not be visible to you again. </div>
+                </div>
 
-                <p>Your API base url is located at:<br>
+                <p>{{ trans('account/general.api_base_url') }}<br>
-                    <code>{{ url('/api/v1') }}/&lt;endpoint&gt;</code></p>
+                    <code>{{ url('/api/v1') }}{{!! trans('account/general.api_base_url_endpoint') !!}}</code></p>
 
-                <p>API tokens are set to expire in:
+                <p>{{ trans('account/general.api_token_expiration_time') }}
-                    <strong>{{ config('passport.expiration_years') }} years</strong>.</p>
+                    <strong>{{ config('passport.expiration_years') }} {{ trans('general.years') }} </strong>.</p>
 
 
-                <p>Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
+                <p>{{!! trans('account/general.api_reference') !!}}</p>
-                    find specific API endpoints and additional API documentation.</p>
             </div>
         </div>
 

resources/views/account/change-password.blade.php

@@ -20,7 +20,7 @@
 
     <!-- Old Password -->
     <div class="form-group {{ $errors->has('current_password') ? ' has-error' : '' }}">
-        <label for="current_password" class="col-md-3 control-label">Current Password
+        <label for="current_password" class="col-md-3 control-label"> {{ trans('general.current_password') }} </label>
         </label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
@@ -32,7 +32,7 @@
     </div>
 
     <div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
-        <label for="password" class="col-md-3 control-label">New Password</label>
+        <label for="password" class="col-md-3 control-label">{{ trans('general.new_password') }}</label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
             {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -44,7 +44,7 @@
 
 
     <div class="form-group {{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-        <label for="password_confirmation" class="col-md-3 control-label">New Password</label>
+        <label for="password_confirmation" class="col-md-3 control-label">{{ trans('general.new_password') }}</label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="password_confirmation" id="password_confirmation"  {{ (config('app.lock_passwords') ? ' disabled' : '') }} aria-label="password_confirmation">
             {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

resources/views/account/profile.blade.php

@@ -97,7 +97,7 @@
             {!! $errors->first('gravatar', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             <p>
               <img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image">
-              <a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.
+              {{!! trans('general.gravatar_url') !!}}
             </p>
           </div>
         </div>

resources/views/account/requestable-assets.blade.php

@@ -72,7 +72,7 @@
                         <div class="col-md-12">
 
                             @if ($models->count() > 0)
-                            <h2>Requestable Models</h4>
+                            <h2>{{ trans('general.requestable_models') }}</h4>
                                 <table
                                         name="requested-assets"
                                         data-toolbar="#toolbar"

resources/views/account/requested.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-   Requested Assets
+   {{ trans('general.requested_assets')}}
 @stop
 
 {{-- Account page content --}}
@@ -32,13 +32,13 @@
                 }'>
                         <thead>
                         <tr>
-                            <th class="col-md-1" data-field="image" data-formatter="imageFormatter">Image</th>
+                            <th class="col-md-1" data-field="image" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
-                            <th class="col-md-2" data-field="name">Item Name</th>
+                            <th class="col-md-2" data-field="name">{{ trans('general.item_name') }}</th>
-                            <th class="col-md-2" data-field="type">Type</th>
+                            <th class="col-md-2" data-field="type">{{ trans('general.type') }}</th>
                             <th class="col-md-2" data-field="qty">{{ trans('general.qty') }}</th>
                             <th class="col-md-2" data-field="location">{{ trans('admin/hardware/table.location') }}</th>
                             <th class="col-md-2" data-field="expected_checkin" data-formatter="dateDisplayFormatter"> {{ trans('admin/hardware/form.expected_checkin') }}</th>
-                            <th class="col-md-2" data-field="request_date" data-formatter="dateDisplayFormatter">Requested Date</th>
+                            <th class="col-md-2" data-field="request_date" data-formatter="dateDisplayFormatter"> {{ trans('general.requested_date') }}</th>
                         </tr>
                         </thead>
                     </table>

resources/views/account/view-assets.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-View Assets for  {{ $user->present()->fullName() }}
+{{ trans('general.viewassetsfor', array('name' => $user->present()->fullName())) }}
 @parent
 @stop
 
@@ -294,7 +294,7 @@ View Assets for  {{ $user->present()->fullName() }}
       @if ($user->id)
       <div class="box-header with-border">
         <div class="box-heading">
-          <h2 class="box-title"> History</h2>
+          <h2 class="box-title"> {{ trans('general.history') }}</h2>
         </div>
       </div><!-- /.box-header -->
       @endif

resources/views/companies/index.blade.php

@@ -44,10 +44,8 @@
     </div>
     <!-- side address column -->
     <div class="col-md-3">
-      <h2>About Companies</h2>
+      <h2>{{ trans('admin/companies/general.about_companies') }}</h2>
-      <p>
+      <p>{{ trans('admin/companies/general.about_companies_description') }}</p>
-        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.
-      </p>
   </div>
 
 @stop

resources/views/custom_fields/fields/edit.blade.php

@@ -96,11 +96,11 @@
           <!-- Help Text -->
           <div class="form-group {{ $errors->has('help_text') ? ' has-error' : '' }}">
               <label for="help_text" class="col-md-4 control-label">
-                  Help Text
+                  {{ trans('admin/custom_fields/general.help_text') }}
               </label>
               <div class="col-md-6">
                   {{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }}
-                  <p class="help-block">This is optional text that will appear below the form elements while editing an asset to provide context on the field.</p>
+                  <p class="help-block">{{ trans('admin/custom_fields/general.help_text_description') }}</p>
                   {!! $errors->first('help_text', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
           </div>
@@ -147,8 +147,8 @@
   </div> <!--/.col-md-9-->
 
   <div class="col-md-3">
-    <h2>About Custom Fields</h2>
+    <h2>{{ trans('admin/custom_fields/general.about_custom_fields_title') }}</h2>
-    <p>Custom fields allow you to add arbitrary attributes to assets.</p>
+    <p>{{ trans('admin/custom_fields/general.about_custom_fields_text') }}</p>
   </div>
   
 </div>

resources/views/custom_fields/fieldsets/edit.blade.php

@@ -42,8 +42,8 @@
     {{ Form::close() }}
   </div>
   <div class="col-md-3">
-    <h2>About Fieldsets</h4>
+    <h2>{{ trans('admin/custom_fields/general.about_fieldsets_title') }}</h4>
-    <p>Fieldsets work like containers of the custom fields you've created. This allows you to group commonly used custom attributes together for easy associations. </p>
+    <p>{{ trans('admin/custom_fields/general.about_fieldsets_text') }}</p>
   </div>
 </div>
 @stop

resources/views/custom_fields/fieldsets/view.blade.php

@@ -27,7 +27,7 @@
             <tr>
               {{-- Hide the sorting handle if we can't update the fieldset --}}
               @can('update', $custom_fieldset)
-              <th class="col-md-1"><span class="sr-only">Reorder</span></th>
+              <th class="col-md-1"><span class="sr-only">{{ trans('admin/custom_fields/general.reorder') }}</span></th>
               @endcan
               <th class="col-md-1">{{ trans('admin/custom_fields/general.order') }}</th>
               <th class="col-md-3">{{ trans('admin/custom_fields/general.field_name') }}</th>
@@ -35,7 +35,7 @@
               <th class="col-md-2">{{ trans('admin/custom_fields/general.field_element') }}</th>
               <th class="col-md-1">{{ trans('admin/custom_fields/general.encrypted') }}</th>
               <th class="col-md-1">{{ trans('admin/custom_fields/general.required') }}</th>
-              <th class="col-md-1"><span class="sr-only">Remove</span></th>
+              <th class="col-md-1"><span class="sr-only">{{ trans('button.remove') }}</span></th>
             </tr>
           </thead>
           <tbody>
@@ -57,7 +57,7 @@
               <td>{{$field->element}}</td>
               <td>{{ $field->field_encrypted=='1' ?  trans('general.yes') : trans('general.no') }}</td>
                 <td>
-                  
+
                     @if ($field->pivot->required)
                     <form method="post" action="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}">
                       @csrf 
@@ -71,13 +71,13 @@
                       <button type="submit" class="btn btn-link"><i class="fa fa-times text-danger" aria-hidden="true"></i></button>
                       </form>
                     @endif
-                    
+
                 </td>
               <td>
                 @can('update', $custom_fieldset)
                 <form method="post" action="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}">
                   @csrf 
-                  <button type="submit" class="btn btn-sm btn-danger">Remove</button>
+                  <button type="submit" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</button>
                 </form>
                 @endcan
               </td>
@@ -96,7 +96,7 @@
 
                 <div class="form-group col-md-4">
                   <label for="field_id" class="sr-only">
-                   Add Field to Fieldset
+                    {{ trans('admin/custom-field/general.add_field_to_fieldset')}}
                   </label>
                   {{ Form::select("field_id",$custom_fields_list,"",['aria-label'=>'field_id', 'class'=>'select2']) }}
 
@@ -113,7 +113,7 @@
                 <div class="form-group col-md-2">
 
                   {{ Form::text('order', $maxid, array('class' => 'form-control col-sm-1 col-md-1', 'style'=> 'width: 80px; padding-;right: 10px;', 'aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }}
-                  <label for="order">   Order </label>
+                  <label for="order">{{ trans('admin/custom_fields/general.order') }}</label>
                 </div>
 
                 <div class="form-group col-md-3">

resources/views/custom_fields/index.blade.php

@@ -6,7 +6,7 @@
 
 {{-- Page title --}}
 @section('title')
-  Manage {{ trans('admin/custom_fields/general.custom_fields') }}
+  {{ trans('admin/custom_fields/general.manage') }} {{ trans('admin/custom_fields/general.custom_fields') }}
 @parent
 @stop
 
@@ -21,7 +21,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomFieldset::class)
-          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="Create a new fieldset">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
+          <a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
           @endcan
         </div>
       </div><!-- /.box-header -->
@@ -48,7 +48,7 @@
               <th>{{ trans('general.name') }}</th>
               <th>{{ trans('admin/custom_fields/general.qty_fields') }}</th>
               <th>{{ trans('admin/custom_fields/general.used_by_models') }}</th>
-              <th>Actions</th>
+              <th>{{ trans('table.actions') }}</th>
             </tr>
           </thead>
 
@@ -100,7 +100,7 @@
         <h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
         <div class="box-tools pull-right">
           @can('create', \App\Models\CustomField::class)
-          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="Create a new custom field">{{ trans('admin/custom_fields/general.create_field') }}</a>
+          <a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-toggle="tooltip" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
           @endcan
         </div>
 
@@ -127,13 +127,13 @@
           <thead>
             <tr>
               <th data-searchable="true">{{ trans('general.name') }}</th>
-              <th data-searchable="true">Help Text</th>
+              <th data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
-              <th data-searchable="true">Email</th>
+              <th data-searchable="true">{{ trans('general.email') }}</th>
-              <th data-visible="false">DB Field</th>
+              <th data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
               <th data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
               <th data-searchable="true">{{ trans('admin/custom_fields/general.field_element_short') }}</th>
               <th data-searchable="true">{{ trans('admin/custom_fields/general.fieldsets') }}</th>
-              <th>Actions</th>
+              <th>{{ trans('button.actions') }}</th>
             </tr>
           </thead>
           <tbody>
@@ -145,7 +145,7 @@
               <td>
                  <code>{{ $field->convertUnicodeDbSlug() }}</code>
                 @if ($field->convertUnicodeDbSlug()!=$field->db_column)
-                  <br><i class="fas fa-exclamation-triangle text-danger"></i>WARNING. This field is in the custom fields table as <code>{{  $field->db_column }}</code> but should be <code>{{ $field->convertUnicodeDbSlug() }}</code>.
+                  <br><i class="fas fa-exclamation-triangle text-danger"></i>{{!! trans('admin/custom_fields/general.db_convert_warning', array('db_column' => $field->db_column, 'expected' => $field->convertUnicodeDbSlug())) !!}}
                 @endif
               </td>
               <td>{{ $field->format }}</td>
@@ -160,19 +160,19 @@
                   @can('update', $field)
                 <a href="{{ route('fields.edit', $field->id) }}" class="btn btn-warning btn-sm">
                   <i class="fas fa-pencil-alt" aria-hidden="true"></i>
-                  <span class="sr-only">Edit</span>
+                  <span class="sr-only">{{ trans('button.edit') }}</span>
                 </a>
-                @endcan               
+                @endcan
                 @can('delete', $field)
                 {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }}
                 @if($field->fieldset->count()>0)
                 <button type="submit" class="btn btn-danger btn-sm disabled" disabled>
                   <i class="fas fa-trash" aria-hidden="true"></i>
-                  <span class="sr-only">Delete</span></button>
+                  <span class="sr-only">{{ trans('button.delete') }}</span></button>
                 @else
                 <button type="submit" class="btn btn-danger btn-sm">
                   <i class="fas fa-trash" aria-hidden="true"></i>
-                  <span class="sr-only">Delete</span>
+                  <span class="sr-only">{{ trans('button.delete') }}</span>
                 </button>
                 @endif
                 {{ Form::close() }}

resources/views/dashboard.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-
 {{-- Page title --}}
 @section('title')
 {{ trans('general.dashboard') }}
@@ -147,7 +146,7 @@
         <div class="col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h2 class="box-title">This is your dashboard. There are many like it, but this one is yours.</h2>
+                    <h2 class="box-title">{{ trans('general.dashboard_info') }}</h2>
                 </div>
                 <!-- /.box-header -->
                 <div class="box-body">
@@ -156,34 +155,34 @@
 
                             <div class="progress">
                                 <div class="progress-bar progress-bar-yellow" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-                                    <span class="sr-only">60% Complete (warning)</span>
+                                    <span class="sr-only">{{ trans('general.60_percent_warning') }}</span>
                                 </div>
                             </div>
 
 
-                            <p><strong>It looks like you haven't added anything yet, so we don't have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!</strong></p>
+                            <p><strong>{{ trans('general.dashboard_empty') }}</strong></p>
 
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-md-3">
                             @can('create', \App\Models\Asset::class)
-                            <a class="btn bg-teal" style="width: 100%" href="{{ route('hardware.create') }}">New Asset</a>
+                            <a class="btn bg-teal" style="width: 100%" href="{{ route('hardware.create') }}">{{ trans('general.new_asset') }}</a>
                             @endcan
                         </div>
                         <div class="col-md-3">
                             @can('create', \App\Models\License::class)
-                                <a class="btn bg-maroon" style="width: 100%" href="{{ route('licenses.create') }}">New License</a>
+                                <a class="btn bg-maroon" style="width: 100%" href="{{ route('licenses.create') }}">{{ trans('general.new_license') }}</a>
                             @endcan
                         </div>
                         <div class="col-md-3">
                             @can('create', \App\Models\Accessory::class)
-                                <a class="btn bg-orange" style="width: 100%" href="{{ route('accessories.create') }}">New Accessory</a>
+                                <a class="btn bg-orange" style="width: 100%" href="{{ route('accessories.create') }}">{{ trans('general.new_accessory') }}</a>
                             @endcan
                         </div>
                         <div class="col-md-3">
                             @can('create', \App\Models\Consumable::class)
-                                <a class="btn bg-purple" style="width: 100%" href="{{ route('consumables.create') }}">New Consumable</a>
+                                <a class="btn bg-purple" style="width: 100%" href="{{ route('consumables.create') }}">{{ trans('general.new_consumable') }}</a>
                             @endcan
                         </div>
                     </div>
@@ -203,7 +202,7 @@
         <div class="box-tools pull-right">
             <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
                 <i class="fas fa-minus" aria-hidden="true"></i>
-                <span class="sr-only">Collapse</span>
+                <span class="sr-only">{{ trans('general.collapse') }}</span>
             </button>
         </div>
       </div><!-- /.box-header -->
@@ -225,7 +224,7 @@
                     data-url="{{ route('api.activity.index', ['limit' => 25]) }}">
                     <thead>
                     <tr>
-                        <th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span  class="sr-only">Icon</span></th>
+                        <th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span  class="sr-only">{{ trans('admin/hardware/table.icon') }}</span></th>
                         <th class="col-sm-3" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
                         <th class="col-sm-2" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                         <th class="col-sm-2" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
@@ -249,11 +248,11 @@
   <div class="col-md-4">
         <div class="box box-default">
             <div class="box-header with-border">
-                <h2 class="box-title">{{ trans('general.assets') }} by Status</h2>
+                <h2 class="box-title">{{ trans('general.assets') }} {{ trans('general.bystatus') }}</h2>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
                         <i class="fas fa-minus" aria-hidden="true"></i>
-                        <span class="sr-only">Collapse</span>
+                        <span class="sr-only">{{ trans('general.collapse') }}</span>
                     </button>
                 </div>
             </div>
@@ -276,11 +275,11 @@
          <!-- Categories -->
          <div class="box box-default">
             <div class="box-header with-border">
-                <h2 class="box-title">Asset {{ trans('general.locations') }}</h2>
+                <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.locations') }}</h2>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse">
                         <i class="fas fa-minus" aria-hidden="true"></i>
-                        <span class="sr-only">Collapse</span>
+                        <span class="sr-only">{{ trans('general.collapse') }}</span>
                     </button>
                 </div>
             </div>
@@ -306,15 +305,15 @@
                                 
                                 <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
                                     <i class="fas fa-barcode" aria-hidden="true"></i>
-                                    <span class="sr-only">Asset Count</span>
+                                    <span class="sr-only">{{ trans('general.asset_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
                                     
-                                    Assigned
+                                    {{ trans('general.assigned') }}
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
                                     <i class="fas fa-users" aria-hidden="true"></i>
-                                    <span class="sr-only">People</span>
+                                    <span class="sr-only">{{ trans('general.people') }}</span>
                                     
                                 </th>
                                 
@@ -336,11 +335,11 @@
         <!-- Categories -->
         <div class="box box-default">
             <div class="box-header with-border">
-                <h2 class="box-title">Asset {{ trans('general.categories') }}</h2>
+                <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.categories') }}</h2>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse">
                         <i class="fas fa-minus" aria-hidden="true"></i>
-                        <span class="sr-only">Collapse</span>
+                        <span class="sr-only">{{ trans('general.collapse') }}</span>
                     </button>
                 </div>
             </div>
@@ -368,23 +367,23 @@
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
                                     <i class="fas fa-barcode" aria-hidden="true"></i>
-                                    <span class="sr-only">Asset Count</span>
+                                    <span class="sr-only">{{ trans('general.asset_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
                                     <i class="far fa-keyboard" aria-hidden="true"></i>
-                                    <span class="sr-only">Accessories Count</span>
+                                    <span class="sr-only">{{ trans('general.accessories_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
                                     <i class="fas fa-tint" aria-hidden="true"></i>
-                                    <span class="sr-only">Consumables Count</span>
+                                    <span class="sr-only">{{ trans('general.consumables_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
                                     <i class="far fa-hdd" aria-hidden="true"></i>
-                                    <span class="sr-only">Components Count</span>
+                                    <span class="sr-only">{{ trans('general.components_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
                                     <i class="far fa-save" aria-hidden="true"></i>
-                                    <span class="sr-only">Licenses Count</span>
+                                    <span class="sr-only">{{ trans('general.licenses_count') }}</span>
                                 </th>
                             </tr>
                             </thead>

resources/views/depreciations/index.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-  Depreciations
+  {{ trans('general.depreciations')}}
 @parent
 @stop
 

resources/views/depreciations/view.blade.php

@@ -111,12 +111,12 @@
                                       ) }}
                             <div class="col-md-12">
                                 <div id="toolbar">
-                                    <label for="bulk_actions" class="sr-only">Bulk Actions</label>
+                                    <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
                                     <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 300px;">
-                                        <option value="edit">Bulk Edit</option>
+                                        <option value="edit">{{ trans('general.bulk_edit') }}</option>
-                                        <option value="delete">Bulk Delete</option>
+                                        <option value="delete">{{ trans('general.bulk_delete') }}</option>
                                     </select>
-                                    <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                                    <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                                 </div>
 
                                 <div class="table-responsive">

resources/views/groups/edit.blade.php

@@ -65,9 +65,9 @@
     <table class="table table-striped permissions">
         <thead>
         <tr class="permissions-row">
-            <th class="col-md-5">Permission</th>
+            <th class="col-md-5">{{ trans('admin/groups/titles.permission')}}</th>
-            <th class="col-md-1">Grant</th>
+            <th class="col-md-1">{{ trans('admin/groups/titles.grant')}}</th>
-            <th class="col-md-1">Deny</th>
+            <th class="col-md-1">{{ trans('admin/groups/titles.deny')}}</th>
         </tr>
         </thead>
         @foreach ($permissions as $area => $area_permission)
@@ -87,11 +87,11 @@
                             @endunless
                     </td>
                     <td class="col-md-1 permissions-item">
-                        <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">Allow {{ 'permission['.$localPermission['permission'].']' }}</span></label>
+                        <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
                     </td>
                     <td class="col-md-1 permissions-item">
-                        <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">Deny {{ 'permission['.$localPermission['permission'].']' }}</span></label>
+                        <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
                     </td>
                 </tr>
@@ -108,11 +108,11 @@
 
                     </td>
                     <td class="col-md-1 permissions-item" style="vertical-align: bottom">
-                        <label for="{{ $area }}"><span class="sr-only">Allow {{ $area }}</span></label>
+                        <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ $area }}</span></label>
                         {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
                     </td>
                     <td class="col-md-1 permissions-item">
-                        <label for="{{ $area }}"><span class="sr-only">Deny {{ $area }}</span></label>
+                        <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ $area }}</span></label>
                         {{ Form::radio("$area", '0',false,['value'=>"deny", 'class'=>'minimal', 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
                     </td>
                 </tr>
@@ -128,11 +128,11 @@
                                 {{ $this_permission['label'] }}
                         </td>
                         <td class="col-md-1 permissions-item">
-                            <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">Allow {{ 'permission['.$this_permission['permission'].']' }}</span></label>
+                            <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
                             {{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
                         </td>
                         <td class="col-md-1 permissions-item">
-                            <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">Deny {{ 'permission['.$this_permission['permission'].']' }}</span></label>
+                            <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
                             {{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'minimal radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
                         </td>
 

resources/views/groups/view.blade.php

@@ -57,7 +57,7 @@
 
             </ul>
             @else
-                <p>This group has no permissions.</p>
+                <p>{{ trans('admin/groups/title.no_permissions') }}</p>
             @endif
 
         </div>

resources/views/hardware/audit.blade.php

@@ -57,7 +57,7 @@
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-md-9">
                                 <label>
-                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> Update asset location
+                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
                                 </label>
 
                                 @include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right'])

resources/views/hardware/bulk-delete.blade.php

@@ -29,10 +29,10 @@
             <thead>
               <tr>
                 <td></td>
-                <td>ID</td>
+                <td>{{ trans('admin/hardware/table.id') }}</td>
-                <td>Name</td>
+                <td>{{ trans('admin/hardware/table.name') }}</td>
-                <td>Location</td>
+                <td>{{ trans('admin/hardware/table.location')}}</td>
-                <td>Assigned To</td>
+                <td>{{ trans('admin/hardware/table.assigned_to') }}</td>
               </tr>
             </thead>
             <tbody>
@@ -59,7 +59,7 @@
 
         <div class="box-footer text-right">
           <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-          <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.delete') }}</button>
+          <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.delete') }}</button>
         </div><!-- /.box-footer -->
       </div><!-- /.box -->
     </form>

resources/views/hardware/bulk.blade.php

@@ -75,12 +75,12 @@
 
                 <label for="update_real_loc">
                   {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_real_loc']) }}
-                  Update default location AND actual location
+                  {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                 </label>
                 <br>
                 <label for="update_default_loc">
                   {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_default_loc']) }}
-                  Update only default location
+                  {{ trans('admin/hardware/form.asset_location_update_default') }}
                 </label>
 
             </div>
@@ -137,13 +137,13 @@
             </div>
             <div class="col-md-7">
               <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="1"> Yes
+                <input type="radio" class="minimal" name="requestable" value="1"> {{ trans('general.yes')}}
               </label>
               <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="0"> No
+                <input type="radio" class="minimal" name="requestable" value="0"> {{ trans('general.no')}}
               </label>
               <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value=""> Do Not Change
+                <input type="radio" class="minimal" name="requestable" value=""> {{ trans('general.do_not_change')}}
               </label>
             </div>
           </div>

resources/views/hardware/checkout.blade.php

@@ -124,7 +124,7 @@
 
                                         @if ($snipeSettings->slack_endpoint!='')
                                             <i class="fab fa-slack" aria-hidden="true"></i>
-                                            A slack message will be sent
+                                            {{ trans('general.slack_msg_note')}}
                                         @endif
                                     </div>
                                 </div>

resources/views/hardware/edit.blade.php

@@ -181,7 +181,7 @@
                         $("#selected_status_status").removeClass('text-danger');
                         $("#selected_status_status").removeClass('text-warning');
                         $("#selected_status_status").addClass('text-success');
-                        $("#selected_status_status").html('<i class="fas fa-check"></i> That status is deployable. This asset can be checked out.');
+                        $("#selected_status_status").html('<i class="fas fa-check"></i> {{ trans('admin/hardware/form.asset_deployable')}}');
 
 
                     } else {
@@ -189,7 +189,7 @@
                         $("#selected_status_status").removeClass('text-danger');
                         $("#selected_status_status").removeClass('text-success');
                         $("#selected_status_status").addClass('text-warning');
-                        $("#selected_status_status").html('<i class="fas fa-exclamation-triangle"></i> That asset status is not deployable. This asset cannot be checked out. ');
+                        $("#selected_status_status").html('<i class="fas fa-exclamation-triangle"></i> {{ trans('admin/hardware/form.asset_not_deployable')}} ');
                     }
                 }
             });

resources/views/hardware/history.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Import History
+    {{ trans('general.import-history') }}
     @parent
 @stop
 
@@ -22,8 +22,8 @@
                     <div class="box box-default">
                         <div class="alert alert-danger">
                             <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-                            <strong>{{ count($status['error']) }} Error Messagess: </strong>
+                            <strong>{{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }}</strong> </strong>
-                            Please see below for errors.
+                            {{ trans('admin/hardware/general.alert_details') }}
                         </div>
                     </div>
                 </div>
@@ -35,8 +35,8 @@
                 <div class="box box-default">
                     <div class="alert alert-success">
                         <i class="fas fa-check faa-pulse animated"></i>
-                        <strong>{{ count($status['success']) }} Success Messages: </strong>
+                        <strong>{{ count($status['success']) }} {{ trans('admin/hardware/general.success_messages') }} </strong>
-                        Please see below for details.
+                        {{ trans('admin/hardware/general.alert_details') }}
                     </div>
                 </div>
             </div>
@@ -55,18 +55,12 @@
 
                         @if (Session::get('message'))
                             <p class="alert-danger">
-                                You have an error in your CSV file:<br />
+                                {{ trans('admin/hardware/general.csv_error') }}<br />
                                 {{ Session::get('message') }}
                             </p>
                         @endif
 
-                        <p>
+                        {!! trans('admin/hardware/general.import_text') !!}
-                           Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &gt; General Settings.
-                        </p>
-
-                        <p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p>
-
-                        <p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
 
                         <div class="form-group">
                             <label for="first_name" class="col-sm-3 control-label">{{ trans('admin/users/general.usercsv') }}</label>
@@ -86,7 +80,7 @@
                     <div class="col-sm-2">
                     </div>
                     <div class="col-sm-10">
-                        {{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }} Try to match users by firstname.lastname (jane.smith) format
+                        {{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }} {{ trans('admin/hardware/general.csv_import_match_f-l') }}
                     </div>
                 </div>
 
@@ -95,7 +89,7 @@
                     <div class="col-sm-2">
                     </div>
                     <div class="col-sm-10">
-                        {{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }} Try to match users by first initial last name (jsmith) format
+                        {{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }} {{ trans('admin/hardware/general.csv_import_match_initial_last') }}
                     </div>
                 </div>
 
@@ -104,7 +98,7 @@
                     <div class="col-sm-2">
                     </div>
                     <div class="col-sm-10">
-                        {{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }} Try to match users by first name (jane) format
+                        {{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }} {{ trans('admin/hardware/general.csv_import_match_first') }}
                     </div>
                 </div>
 
@@ -113,7 +107,7 @@
                     <div class="col-sm-2">
                     </div>
                     <div class="col-sm-10">
-                        {{ Form::checkbox('match_email', '1', Request::old('match_email')) }} Try to match users by email as username
+                        {{ Form::checkbox('match_email', '1', Request::old('match_email')) }} {{ trans('admin/hardware/general.csv_import_match_email') }}
                     </div>
                 </div>
 
@@ -122,7 +116,7 @@
                     <div class="col-sm-2">
                     </div>
                     <div class="col-sm-10">
-                        {{ Form::checkbox('match_username', '1', Request::old('match_username')) }} Try to match users by username
+                        {{ Form::checkbox('match_username', '1', Request::old('match_username')) }} {{ trans('admin/hardware/general.csv_import_match_username') }}
                     </div>
                 </div>
 
@@ -158,7 +152,7 @@
                     <div class="col-md-12">
                         <div class="box box-default">
                             <div class="box-header with-border">
-                                <h2 class="box-title"> {{ count($status['error']) }} Error Messages </h2>
+                                <h2 class="box-title"> {{ count($status['error']) }} {{ trans('admin/hardware/general.error_messages') }} </h2>
                             </div>
                             <div class="box-body">
                                 <div style="height : 400px; overflow : auto;">
@@ -185,7 +179,7 @@
                             <div class="col-md-12">
                                 <div class="box box-default">
                                     <div class="box-header with-border">
-                                        <h2 class="box-title"> {{ count($status['success']) }} Success Messages </h2>
+                                        <h2 class="box-title"> {{ count($status['success']) }} {{ trans('admin/hardware/general.success_messages') }} </h2>
                                     </div>
                                     <div class="box-body">
                                         <div style="height : 400px; overflow : auto;">

resources/views/hardware/index.blade.php

@@ -43,7 +43,7 @@
 
 @section('header_right')
   <a href="{{ route('reports/custom') }}" style="margin-right: 5px;" class="btn btn-default">
-    Custom Export</a>
+    {{ trans('admin/hardware/general.custom_export') }}</a>
   @can('create', \App\Models\Asset::class)
   <a href="{{ route('hardware.create') }}" class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
   @endcan
@@ -73,14 +73,14 @@
                         'id' => 'bulkForm']) }}
                         
                      
-                      <label for="bulk_actions"><span class="sr-only">Bulk Actions</span></label>
+                      <label for="bulk_actions"><span class="sr-only">{{ trans('button.bulk_actions') }}</span></label>
                       <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions">
                         <option value="edit">{{ trans('button.edit') }}</option>
                         <option value="delete">{{ trans('button.delete') }}</option>
                         <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
                       </select>
                       
-                      <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                      <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                       {{ Form::close() }}   
                     </div>
                    

resources/views/hardware/quickscan.blade.php

@@ -51,7 +51,7 @@
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-md-9">
                                 <label>
-                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> Update asset location
+                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
                                 </label> <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to."><i class="far fa-life-ring"></i></a>
                             </div>
                         </div>
@@ -112,7 +112,7 @@
                         </tr>
                         <tr id="audit-loader" style="display: none;">
                             <td colspan="3">
-                                <i class="fas fa-spinner spin" aria-hidden="true"></i> Processing...
+                                <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('admin/hardware/form.processing_spinner') }}
                             </td>
                         </tr>
                         </thead>

resources/views/hardware/requested.blade.php

@@ -49,8 +49,8 @@
                         <th class="col-md-2">Item Name</th>
                         <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
                         <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
-                        <th class="col-md-3" data-sortable="true">Requesting User</th>
+                        <th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/form.requesting_user') }}</th>
-                        <th class="col-md-2">Requested Date</th>
+                        <th class="col-md-2">{{ trans('admin/hardware/form.requested_date') }}</th>
                         <th class="col-md-1"></th>
                         <th class="col-md-1"></th>
                     </tr>
@@ -107,9 +107,9 @@
                             <td>
                                 @if ($request->itemType() == "asset")
                                     @if ($request->requestable->assigned_to=='')
-                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="Check this item out to a user">{{ trans('general.checkout') }}</a>
+                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
                                         @else
-                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this itemi">{{ trans('general.checkin') }}</a>
+                                        <a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_toolip') }}">{{ trans('general.checkin') }}</a>
                                     @endif
 
                                 @endif

resources/views/hardware/view.blade.php

@@ -972,13 +972,13 @@
                                               'class' => 'form-inline',
                                                'id' => 'bulkForm']) }}
                                     <div id="toolbar">
-                                        <label for="bulk_actions"><span class="sr-only">Bulk Actions</span></label>
+                                        <label for="bulk_actions"><span class="sr-only">{{ trans('general.bulk_actions')}}</span></label>
                                         <select name="bulk_actions" class="form-control select2" style="width: 150px;" aria-label="bulk_actions">
-                                            <option value="edit">Edit</option>
+                                            <option value="edit">{{ trans('button.edit') }}</option>
-                                            <option value="delete">Delete</option>
+                                            <option value="delete">{{ trans('button.delete')}}</option>
-                                            <option value="labels">Generate Labels</option>
+                                            <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
                                         </select>
-                                        <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                                        <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                                     </div>
 
                                     <!-- checked out assets table -->
@@ -1028,7 +1028,7 @@
                             <div class="col-md-12">
                                 @can('update', \App\Models\Asset::class)
                                     <div id="maintenance-toolbar">
-                                        <a href="{{ route('maintenances.create', ['asset_id' => $asset->id]) }}" class="btn btn-primary">Add Maintenance</a>
+                                        <a href="{{ route('maintenances.create', ['asset_id' => $asset->id]) }}" class="btn btn-primary">{{ trans('button.add_maintenance') }}</a>
                                     </div>
                             @endcan
 
@@ -1083,7 +1083,7 @@
                       data-cookie="true">
                 <thead>
                 <tr>
-                  <th data-visible="true" style="width: 40px;" class="hidden-xs">Icon</th>
+                  <th data-visible="true" style="width: 40px;" class="hidden-xs">{{ trans('admin/hardware/table.icon') }}</th>
                   <th class="col-sm-2" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
                   <th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                   <th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
@@ -1094,7 +1094,7 @@
                     <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
                   <th class="col-md-3" data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
-                  <th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">Changed</th>
+                  <th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
                 </tr>
                 </thead>
               </table>

resources/views/importer/import.blade.php

@@ -42,9 +42,9 @@
                                     <!-- The fileinput-button span is used to style the file input field as button -->
                                     @if (!config('app.lock_passwords'))
                                         <span class="btn btn-primary fileinput-button">
-                                        <span>Select Import File...</span>
+                                        <span>{{ trans('admin/importer/general.select_import_file') }}</span>
                                          <!-- The file input field used as target for the file upload widget -->
-                                        <label for="files[]"><span class="sr-only">Select file</span></label>
+                                        <label for="files[]"><span class="sr-only">{{ trans('admin/importer/general.select_file') }}</span></label>
                                         <input id="fileupload" type="file" name="files[]" data-url="{{ route('api.imports.index') }}" accept="text/csv" aria-label="files[]">
                                         </span>
                                     @endif
@@ -67,11 +67,11 @@
                                         class="col-md-12 table table-striped snipe-table">
 
                                     <tr>
-                                        <th class="col-md-6">File</th>
+                                        <th class="col-md-6">{{ trans('admin/importer/table.file') }}</th>
-                                        <th class="col-md-3">Created</th>
+                                        <th class="col-md-3">{{ trans('admin/importer/table.created') }}</th>
-                                        <th class="col-md-1">Size</th>
+                                        <th class="col-md-1">{{ trans('admin/importer/table.size') }}</th>
-                                        <th class="col-md-1 text-right"><span class="sr-only">Process</span></th>
+                                        <th class="col-md-1 text-right"><span class="sr-only">{{ trans('admin/importer/table.process') }}</span></th>
-                                        <th class="col-md-1 text-right"><span class="sr-only">Delete</span></th>
+                                        <th class="col-md-1 text-right"><span class="sr-only">{{ trans('admin/importer/table.delete') }}</span></th>
                                     </tr>
 
                                     <template v-for="currentFile in files">
@@ -81,7 +81,7 @@
                                     			<td class="col-md-1">@{{ currentFile.filesize }}</td>
                                                 <td class="col-md-1 text-right">
                                                     <button class="btn btn-sm btn-info" @click="toggleEvent(currentFile.id)">
-                                                        Process
+                                                        {{ trans('admin/importer/button.process') }}
                                                     </button>
                                                 </td>
                                                 <td class="col-md-1 text-right">

resources/views/kits/accessory-edit.blade.php

@@ -1,12 +1,12 @@
 @extends('layouts/edit-form', [
-    'createText' => 'Append accessory',          // TODO: trans
+    'createText' => {{ trans('admin/kits/general.append_accessory') }},
-    'updateText' => 'Update appended accessory', // TODO: trans
+    'updateText' => {{ trans('admin/kits/general.update_appended_accessory') }},
     'formAction' => (isset($item->id)) ? route('kits.accessories.update', ['kit_id' => $kit->id, 'accessory_id' => $item->accessory_id]) : route('kits.accessories.store', ['kit_id' => $kit->id]),
 ])
 
 {{-- Page content --}}
 @section('inputFields')
-@include ('partials.forms.edit.accessory-select', ['translated_name' => 'Accessory', 'fieldname' => 'accessory_id', 'required' => 'true']){{-- TODO: trans --}}
+@include ('partials.forms.edit.accessory-select', ['translated_name' => {{ trans('general.accessory')}}, 'fieldname' => 'accessory_id', 'required' => 'true'])
 <div class="form-group {{ $errors->has('quantity') ? ' has-error' : '' }}">
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">

resources/views/kits/consumable-edit.blade.php

@@ -1,12 +1,12 @@
 @extends('layouts/edit-form', [
-    'createText' => 'Append consumable',          // TODO: trans
+    'createText' => {{ trans('admin/kits/general.append_consumable') }},
-    'updateText' => 'Update appended consumable', // TODO: trans
+    'updateText' => {{ trans('admin/kits/general.update_appended_consumable') }},
     'formAction' => (isset($item->id)) ? route('kits.consumables.update', ['kit_id' => $kit->id, 'consumable_id' => $item->consumable_id]) : route('kits.consumables.store', ['kit_id' => $kit->id]),
 ])
 
 {{-- Page content --}}
 @section('inputFields')
-@include ('partials.forms.edit.consumable-select', ['translated_name' => 'Consumable', 'fieldname' => 'consumable_id', 'required' => 'true']){{-- TODO: trans --}}
+@include ('partials.forms.edit.consumable-select', ['translated_name' => {{ trans('general.consumable')}}, 'fieldname' => 'consumable_id', 'required' => 'true'])
 
 <div class="form-group {{ $errors->has('quantity') ? ' has-error' : '' }}">
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>

resources/views/kits/edit.blade.php

@@ -41,7 +41,7 @@
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
                 </table>
-                <a href="{{ route('modal.show', ['type' => 'kit-model', 'itemId' => $item->id]) }}" data-refresh="kitModelsTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> Append</a>
+                <a href="{{ route('modal.show', ['type' => 'kit-model', 'itemId' => $item->id]) }}" data-refresh="kitModelsTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('button.append')}}</a>
                 </div>
             </div> <!--.box-body-->
         </div> <!-- /.box.box-default-->

resources/views/kits/index.blade.php

@@ -20,7 +20,6 @@
     <div class="box box-default">
       <div class="box-body">
         <div class="table-responsive">
-
             <table
                 data-cookie-id-table="kitsTable"
                 data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLayout() }}"
@@ -41,7 +40,6 @@
             }'>
           </table>
         </div>
-        
       </div> <!--.box-body-->
     </div> <!-- /.box.box-default-->
   </div> <!-- .col-md-12-->

resources/views/kits/license-edit.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts/edit-form', [
-    'createText' => 'Append license',          // TODO: trans
+    'createText' => {{ trans('admin/kits/general.append_license') }},
-    'updateText' => 'Update appended license', // TODO: trans
+    'updateText' => {{ trans('admin/kits/general.update_appended_license') }},
     'formAction' => (isset($item->id)) ? route('kits.licenses.update', ['kit_id' => $kit->id, 'license_id' => $item->license_id]) : route('kits.licenses.store', ['kit_id' => $kit->id]),
 ])
 

resources/views/kits/model-edit.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts/edit-form', [
-    'createText' => 'Append model',          // TODO: trans
+    'createText' => {{ trans(admin/kits/general.append_model) }},
-    'updateText' => 'Update appended model', // TODO: trans
+    'updateText' => {{ trans(admin/kits/general.update_appended_model) }},
     'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
 ])
 

resources/views/layouts/default.blade.php

@@ -135,7 +135,7 @@
                   <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ url('hardware') }}" tabindex="-1">
                           <i class="fas fa-barcode" aria-hidden="true"></i>
-                          <span class="sr-only">Assets</span>
+                          <span class="sr-only">{{ trans('general.assets') }}</span>
                       </a>
                   </li>
                   @endcan
@@ -143,7 +143,7 @@
                   <li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ route('licenses.index') }}" tabindex="-1">
                           <i class="far fa-save"></i>
-                          <span class="sr-only">Licenses</span>
+                          <span class="sr-only">{{ trans('general.licenses') }}</span>
                       </a>
                   </li>
                   @endcan
@@ -151,7 +151,7 @@
                   <li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ route('accessories.index') }}" tabindex="-1">
                           <i class="far fa-keyboard"></i>
-                          <span class="sr-only">Accessories</span>
+                          <span class="sr-only">{{ trans('general.accessories') }}</span>
                       </a>
                   </li>
                   @endcan
@@ -159,7 +159,7 @@
                   <li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
                       <a href="{{ url('consumables') }}" tabindex="-1">
                           <i class="fas fa-tint"></i>
-                          <span class="sr-only">Consumables</span>
+                          <span class="sr-only">{{ trans('general.consumables') }}</span>
                       </a>
                   </li>
                   @endcan
@@ -167,7 +167,7 @@
                   <li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
                       <a href="{{ route('components.index') }}" tabindex="-1">
                           <i class="far fa-hdd"></i>
-                          <span class="sr-only">Components</span>
+                          <span class="sr-only">{{ trans('general.components') }}</span>
                       </a>
                   </li>
                   @endcan
@@ -184,7 +184,7 @@
                           <div class="col-xs-1">
                               <button type="submit" class="btn btn-primary pull-right">
                                   <i class="fas fa-search" aria-hidden="true"></i>
-                                  <span class="sr-only">Search</span>
+                                  <span class="sr-only">{{ trans('general.search') }}</span>
                               </button>
                           </div>
                       </div>
@@ -264,7 +264,7 @@
                    @endif
                  </a>
                  <ul class="dropdown-menu">
-                   <li class="header">You have {{ count($alert_items) }} items below or almost below minimum quantity levels</li>
+                   <li class="header">{{ trans('general.quantity_minimum', array('count' => count($alert_items))) }}</li>
                    <li>
                      <!-- inner menu: contains the actual data -->
                      <ul class="menu">
@@ -275,7 +275,7 @@
                           <a href="{{route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
                             <h2>{{ $alert_items[$i]['name'] }}
                               <small class="pull-right">
-                                {{ $alert_items[$i]['remaining'] }} remaining
+                                {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}
                               </small>
                             </h2>
                             <div class="progress xs">
@@ -321,12 +321,12 @@
                      <li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
                          <a href="{{ route('account.requested') }}">
                              <i class="fas fa-check fa-disk fa-fw" aria-hidden="true"></i>
-                             Requested Assets
+                             {{ trans('general.requested_assets_menu') }}
                          </a></li>
                      <li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
                          <a href="{{ route('account.accept') }}">
                              <i class="fas fa-check fa-disk fa-fw"></i>
-                             Accept Assets
+                             {{ trans('general.accept_assets_menu') }}
                          </a></li>
 
 
@@ -349,7 +349,7 @@
                      @can('self.api')
                      <li>
                          <a href="{{ route('user.api') }}">
-                             <i class="fas fa-user-secret fa-fw" aria-hidden="true"></i> Manage API Keys
+                             <i class="fas fa-user-secret fa-fw" aria-hidden="true"></i> {{ trans('general.manage_api_keys') }}
                          </a>
                      </li>
                      @endcan
@@ -384,7 +384,7 @@
           </div>
       </nav>
        <a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu" role="button">
-        <span class="sr-only">Toggle navigation</span>
+        <span class="sr-only">{{ trans('general.toggle_navigation') }}</span>
         <i class="fas fa-bars"></i>
       </a>
        <!-- Sidebar toggle button-->
@@ -810,8 +810,8 @@
 
           @if ($snipeSettings->support_footer!='off')
               @if (($snipeSettings->support_footer=='on') || (($snipeSettings->support_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
-                <a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it.readme.io/docs/overview" rel="noopener">User's Manual</a>
+                <a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it.readme.io/docs/overview" rel="noopener">{{ trans('general.user_manual') }}</a>
-                <a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/" rel="noopener">Report a Bug</a>
+                <a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/" rel="noopener">{{ trans('general.bug_report') }}</a>
                  @endif
           @endif
 

resources/views/layouts/setup.blade.php

@@ -64,31 +64,31 @@
                     <div class="row bs-wizard" style="border-bottom:0;">
 
                       <div class="col-xs-3 bs-wizard-step {{ ($step > 1) ? 'complete':'active' }}">
-                        <div class="text-center bs-wizard-stepnum">Step 1</div>
+                        <div class="text-center bs-wizard-stepnum">{{ trans('general.setup_step_1') }}</div>
                         <div class="progress"><div class="progress-bar"></div></div>
                         <a href="{{ route('setup') }}" class="bs-wizard-dot"></a>
-                        <div class="bs-wizard-info text-center">Configuration Check</div>
+                        <div class="bs-wizard-info text-center">{{ trans('general.setup_config_check') }}</div>
                       </div>
 
                       <div class="col-xs-3 bs-wizard-step {{ ($step == 2) ? 'active': (($step < 2) ? 'disabled' : 'complete')  }}"><!-- complete -->
-                        <div class="text-center bs-wizard-stepnum">Step 2</div>
+                        <div class="text-center bs-wizard-stepnum">{{ trans('general.setup_step_2') }}</div>
                         <div class="progress"><div class="progress-bar"></div></div>
                         <a href="{{ route('setup.migrate') }}" class="bs-wizard-dot"></a>
-                        <div class="bs-wizard-info text-center">Create Database Tables</div>
+                        <div class="bs-wizard-info text-center">{{ trans('general.setup_create_database') }}</div>
                       </div>
 
                       <div class="col-xs-3 bs-wizard-step {{ ($step == 3) ? 'active': (($step < 3) ? 'disabled' : 'complete')  }}"><!-- complete -->
-                        <div class="text-center bs-wizard-stepnum">Step 3</div>
+                        <div class="text-center bs-wizard-stepnum">{{ trans('general.setup_step_3') }}</div>
                         <div class="progress"><div class="progress-bar"></div></div>
                         <a href="{{ route('setup.user') }}" class="bs-wizard-dot"></a>
-                        <div class="bs-wizard-info text-center">Create Admin User</div>
+                        <div class="bs-wizard-info text-center">{{ trans('general.setup_create_admin') }}</div>
                       </div>
 
                       <div class="col-xs-3 bs-wizard-step {{ ($step == 4) ? 'active': (($step < 4) ? 'disabled' : 'complete')  }}"><!-- active -->
-                        <div class="text-center bs-wizard-stepnum">Step 4</div>
+                        <div class="text-center bs-wizard-stepnum">{{ trans('general.setup_step_4') }}</div>
                         <div class="progress"><div class="progress-bar"></div></div>
                         <a href="#" class="bs-wizard-dot"></a>
-                        <div class="bs-wizard-info text-center"> Finished!</div>
+                        <div class="bs-wizard-info text-center">{{ trans('general.setup_done') }}</div>
                       </div>
                   </div>
                 </div>

resources/views/licenses/checkout.blade.php

@@ -90,7 +90,7 @@
 
                                 @if ($snipeSettings->slack_endpoint!='')
                                     <i class="fab fa-slack"></i>
-                                    A slack message will be sent
+                                    {{ trans('general.slack_msg_note') }}
                                 @endif
                             </div>
                         </div>

resources/views/licenses/view.blade.php

@@ -454,13 +454,13 @@
                     }'>
             <thead>
               <tr>
-                <th data-visible="true" aria-hidden="true">Icon</th>
+                <th data-visible="true" aria-hidden="true">{{ trans('admin/hardware/table.icon') }}</th>
                 <th class="col-md-3" data-field="file_name" data-visible="true" data-sortable="true" data-switchable="true">{{ trans('general.file_name') }}</th>
                 <th class="col-md-3" data-field="notes" data-visible="true" data-sortable="true" data-switchable="true">{{ trans('general.notes') }}</th>
                 <th class="col-md-2" data-field="created_at" data-visible="true"  data-sortable="true" data-switchable="true">{{ trans('general.created_at') }}</th>
                 <th class="col-md-2" data-searchable="true" data-visible="true">{{ trans('general.image') }}</th>
-                <th class="col-md-2" data-field="download" data-visible="true"  data-sortable="false" data-switchable="true">Download</th>
+                <th class="col-md-2" data-field="download" data-visible="true"  data-sortable="false" data-switchable="true">{{ trans('general.download') }}</th>
-                <th class="col-md-2" data-field="delete" data-visible="true"  data-sortable="false" data-switchable="true">Delete</th>
+                <th class="col-md-2" data-field="delete" data-visible="true"  data-sortable="false" data-switchable="true">{{ trans('general.delete') }}</th>
               </tr>
             </thead>
             <tbody>
@@ -493,14 +493,14 @@
                   @if ($file->filename)
                     <a href="{{ route('show.licensefile', [$license->id, $file->id, 'download' => 'true']) }}" class="btn btn-default">
                       <i class="fas fa-download" aria-hidden="true"></i>
-                      <span class="sr-only">Download</span>
+                      <span class="sr-only">{{ trans('general.download') }}</span>
                     </a>
                   @endif
                 </td>
                 <td>
-                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?">
+                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', array('item' => $file)) }}" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
                     <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                    <span class="sr-only">Delete</span>
+                    <span class="sr-only">{{ trans('general.delete') }}</span>
                   </a>
                 </td>
               </tr>

resources/views/locations/print.blade.php

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Assigned to {{ $location->present()->fullName() }} Location</title>
+    <title>{{ trans('admin/locations/general.assigned_location', array('location' => $location->present()->fullName())) }} </title>
     <style>
         body {
             font-family: "Arial, Helvetica", sans-serif;
@@ -49,16 +49,16 @@
     @endif
 @endif
 
-<h2>Asset Management System</h2>
+<h2>{{ trans('admin/locations/general.asset_management_system') }}</h2>
-<b>Assigned To:</b> {{ $location->present()->fullName() }}
+<b>{{ trans('admin/locations/general.assigned_to') }}</b> {{ $location->present()->fullName() }}
     @if ($parent)
         {{ $parent->present()->fullName() }}
     @endif
 <br>
 @if ($manager)
-    <b>Manager:</b> {{ $manager->present()->fullName() }}<br>
+    <b>{{ trans('admin/locations/general.manager') }}</b> {{ $manager->present()->fullName() }}<br>
 @endif
-<b>Current Date:</b> {{ date("d/m/Y h:i:s A") }}<br><br>
+<b>{{ trans('admin/locations/general.date') }}</b> {{ date("d/m/Y h:i:s A") }}<br><br>
 
 @if ($users->count() > 0)
     @php
@@ -73,11 +73,11 @@
         <thead>
             <tr>
             <th style="width: 5px;"></th>
-            <th style="width: 25%;">Company</th>
+            <th style="width: 25%;">{{ trans('general.company') }}</th>
-            <th style="width: 25%;">User Name</th>
+            <th style="width: 25%;">{{ trans('admin/locations/table.user_name') }}</th>
-            <th style="width: 10%;">Employee No.</th>
+            <th style="width: 10%;">{{ trans('general.employee_number') }}</th>
-	        <th style="width: 20%;">Department</th>
+	        <th style="width: 20%;">{{ trans('admin/locations/table.department') }}</th>
-		    <th style="width: 20%;">Location</th>
+		    <th style="width: 20%;">{{ trans('admin/locations/table.location') }}</th>
             </tr>
         </thead>
     @foreach ($users as $user)
@@ -110,15 +110,15 @@
         <thead>
             <tr>
             <th style="width: 20px;"></th>
-            <th style="width: 10%;">Asset Tag</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_tag') }}</th>
-            <th style="width: 10%;">Name</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_name') }}</th>
-            <th style="width: 10%;">Category</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_category') }}</th>
-	    <th style="width: 10%;">Manufacturer</th>
+	        <th style="width: 10%;">{{ trans('admin/locations/table.asset_manufacturer') }}</th>
-            <th style="width: 15%;">Model</th>
+            <th style="width: 15%;">{{ trans('admin/locations/table.asset_model') }}</th>
-            <th style="width: 15%;">Serial</th>
+            <th style="width: 15%;">{{ trans('admin/locations/table.asset_serial') }}</th>
-            <th style="width: 10%;">Location</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_location') }}</th>
-            <th style="width: 10%;">Checked Out</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_checked_out') }}</th>
-            <th style="width: 10%;">Expected Checkin</th>
+            <th style="width: 10%;">{{ trans('admin/locations/table.asset_expected_checkin') }}</th>
             </tr>
         </thead>
 		@php
@@ -155,10 +155,10 @@
 <br>
 <table>
     <tr>
-        <td>Signed By (Asset Auditor):</td>
+        <td>{{ trans('admin/locations/table.signed_by_asset_auditor') }}</td>
         <td>___________________________</td>
         <td></td>
-        <td>Date:</td>
+        <td>{{ trans('admin/locations/table.date') }}</td>
         <td>____________________</td>
     </tr>
 </table>
@@ -167,10 +167,10 @@
 <br>
 <table>
     <tr>
-        <td>Signed By (Finance Asset Auditor):</td>
+        <td>{{ trans('admin/locations/table.signed_by_finance_auditor') }}</td>
         <td>____________________</td>
         <td></td>
-        <td>Date:</td>
+        <td>{{ trans('admin/locations/table.date') }}</td>
         <td>____________________</td>
     </tr>
 </table>
@@ -179,10 +179,10 @@
 <br>
 <table>
     <tr>
-        <td>Signed By (Location Manager):</td>
+        <td>{{ trans('admin/locations/table.signed_by_location_manager') }}</td>
         <td>_______________________</td>
         <td></td>
-        <td>Date:</td>
+        <td>{{ trans('admin/locations/table.date') }}</td>
         <td>____________________</td>
     </tr>
 </table>

resources/views/modals/kit-accessory.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">Append accessory{{-- TODO: trans --}}</h2>
+            <h4 class="modal-title">{{{{ trans('admin/kits/general.append_accessory') }}}}</h4>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.accessories.store', $kitId) }}" onsubmit="return false">
@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="dynamic-form-row">
-                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">Quantity{{-- TODO: trans --}}:
+                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">{{ trans('general.quantity') }}:
                             </label></div>
                         <div class="col-md-8 col-xs-12 required">
                             <input type='text' name='quantity' id='modal-quantity_id' class="form-control" value="1">

resources/views/modals/kit-consumable.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">Append consumable{{-- TODO: trans --}}</h2>
+            <h4 class="modal-title">{{ trans('admin/kits/general.append_consumable') }}</h4>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.consumables.store', $kitId) }}" onsubmit="return false">
@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="dynamic-form-row">
-                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">Quantity{{-- TODO: trans --}}:
+                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">{{ trans('general.quantity') }}:
                             </label></div>
                         <div class="col-md-8 col-xs-12 required">
                             <input type='text' name='quantity' id='modal-quantity_id' class="form-control" value="1">

resources/views/modals/kit-license.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">Append license{{-- TODO: trans --}}</h2>
+            <h4 class="modal-title">{{ trans('admin/kits/general.append_license') }}</h4>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.licenses.store', $kitId) }}" onsubmit="return false">
@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="dynamic-form-row">
-                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">Quantity{{-- TODO: trans --}}:
+                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">{{ trans('general.quantity') }}:
                             </label></div>
                         <div class="col-md-8 col-xs-12 required">
                             <input type='text' name='quantity' id='modal-quantity_id' class="form-control" value="1">

resources/views/modals/kit-model.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">Append model{{-- TODO: trans --}}</h2>
+            <h4 class="modal-title">{{ trans('admin/kits/general.append_model') }}</h4>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.models.store', $kitId) }}" onsubmit="return false">
@@ -21,7 +21,7 @@
                 </div>
 
                 <div class="dynamic-form-row">
-                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">Quantity{{-- TODO: trans --}}:
+                        <div class="col-md-4 col-xs-12"><label for="modal-quantity_id">{{ trans('general.quantity') }}:
                             </label></div>
                         <div class="col-md-8 col-xs-12 required">
                             <input type='text' name='quantity' id='modal-quantity_id' class="form-control" value="1">

resources/views/modals/upload-file.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h2 class="modal-title" id="uploadFileModalLabel">Upload File</h2>
+                <h2 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
             </div>
             {{ Form::open([
             'method' => 'POST',

resources/views/models/bulk-edit.blade.php

@@ -22,7 +22,7 @@
 
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <div class="box-title"><i class="fas fa-exclamation-triangle"></i> You are about to edit the following: </div>
+                        <div class="box-title"><i class="fas fa-exclamation-triangle"></i>{{ trans('general.bulk_edit_about_to') }}</div>
                     </div>
                     <div class="box-body">
 
@@ -79,9 +79,9 @@
 
                                     <div class="checkbox">
                                         <label for="requestable">
-                                            {{ Form::radio('requestable', '', true, ['aria-label'=>'requestable']) }} Do not change  requestable status<br>
+                                            {{ Form::radio('requestable', '', true, ['aria-label'=>'requestable']) }} {{  trans('admin/hardware/general.requestable_status_warning')}}<br>
                                             {{ Form::radio('requestable', '1', old('requestable'), ['aria-label'=>'requestable']) }}  {{  trans('admin/hardware/general.requestable')}} <br>
-                                            {{ Form::radio('requestable', '0', old('requestable'), ['aria-label'=>'requestable']) }}  Not requestable
+                                            {{ Form::radio('requestable', '0', old('requestable'), ['aria-label'=>'requestable']) }}  {{  trans('admin/hardware/general.not_requestable')}}
     
                                         </label>
                                     </div>

resources/views/models/index.blade.php

@@ -45,10 +45,10 @@
 
             @if (Request::get('status')!='deleted')
               <div id="toolbar">
-                <label for="bulk_actions" class="sr-only">Bulk Actions</label>
+                <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
                 <select id="bulk_actions" name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 300px;">
-                  <option value="edit">Bulk Edit</option>
+                  <option value="edit">{{ trans('general.bulk_edit') }}</option>
-                  <option value="delete">Bulk Delete</option>
+                  <option value="delete">{{ trans('general.bulk_delete') }}</option>
                 </select>
                 <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
               </div>

resources/views/models/view.blade.php

@@ -51,11 +51,11 @@
                       'id' => 'bulkForm']) }}
                   <div id="toolbar">
                       <select name="bulk_actions" class="form-control select2">
-                          <option value="edit">Edit</option>
+                          <option value="edit">{{ trans('button.edit') }}</option>
-                          <option value="delete">Delete</option>
+                          <option value="delete">{{ trans('button.delete') }}</option>
-                          <option value="labels">Generate Labels</option>
+                          <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
                       </select>
-                      <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                      <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                   </div>
 
                   <table
@@ -90,7 +90,7 @@
       <div class="box box-default">
               <div class="box-header with-border">
                   <div class="box-heading">
-                      <h2 class="box-title"> More Info:</h2>
+                      <h2 class="box-title"> {{ trans('general.moreinfo') }}:</h2>
                   </div>
               </div><!-- /.box-header -->
           <div class="box-body">

resources/views/notifications.blade.php

@@ -3,8 +3,8 @@
     <div class="alert alert-danger fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-        <strong>Error: </strong>
+        <strong>{{ trans('general.notification_error') }}</strong>
-         Please check the form below for errors
+         {{ trans('general.notification_error_hint') }}
     </div>
 </div>
 
@@ -16,7 +16,7 @@
         <div class="alert alert-success fade in">
             <button type="button" class="close" data-dismiss="alert">&times;</button>
             <i class="fas fa-check faa-pulse animated"></i>
-            <strong>Success: </strong>
+            <strong>{{ trans('general.notification_success') }} </strong>
             {{ $message }}
         </div>
     </div>
@@ -28,7 +28,7 @@
     <div class="alert alert-success fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-check faa-pulse animated"></i>
-        <strong>Success: </strong>
+        <strong>{{ trans('general.notification_success') }} </strong>
         {{ $message }}
     </div>
 </div>
@@ -41,15 +41,15 @@
             <div class="alert alert-info fade in">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <i class="fas fa-info-circle faa-pulse animated"></i>
-                <strong>Asset Information: </strong>
+                <strong>{{ trans('general.asset_information') }} </strong>
                 <ul>
                     @isset ($asset->model->name)
-                        <li><b>Model Name: </b> {{ $asset->model->name }}</li>
+                        <li><b>{{ trans('general.model_name') }} </b> {{ $asset->model->name }}</li>
                     @endisset
                     @isset ($asset->name)
-                        <li><b>Asset Name: </b> {{ $asset->model->name }}</li>
+                        <li><b>{{ trans('general.asset_name') }} </b> {{ $asset->model->name }}</li>
                     @endisset
-                    <li><b>Asset Tag:</b> {{ $asset->asset_tag }}</li>
+                    <li><b>{{ trans('general.asset_tag') }}</b> {{ $asset->asset_tag }}</li>
                 </ul>
 
             </div>
@@ -64,8 +64,8 @@
             <div class="alert alert-info fade in">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <i class="fas fa-info-circle faa-pulse animated"></i>
-                <strong>Consumable Information: </strong>
+                <strong>{{ trans('general.consumable_information') }} </strong>
-                <ul><li><b>Name:</b> {{ $consumable->name }}</li></ul>
+                <ul><li><b>{{ trans('general.consumable_name') }}</b> {{ $consumable->name }}</li></ul>
             </div>
         </div>
     @endforeach
@@ -78,8 +78,8 @@
             <div class="alert alert-info fade in">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <i class="fas fa-info-circle faa-pulse animated"></i>
-                <strong>Accessory Information: </strong>
+                <strong>{{ trans('general.accessory_information') }} </strong>
-                <ul><li><b>Name:</b> {{ $accessory->name }}</li></ul>
+                <ul><li><b>{{ trans('general.accessory_name') }}</b> {{ $accessory->name }}</li></ul>
             </div>
         </div>
     @endforeach
@@ -91,7 +91,7 @@
     <div class="alert alert alert-danger fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-        <strong>Error: </strong>
+        <strong>{{ trans('general.error') }} </strong>
         {{ $message }}
     </div>
 </div>
@@ -104,7 +104,7 @@
     <div class="alert alert alert-danger fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-        <strong>Error: </strong>
+        <strong>{{ trans('general.notification_error') }} </strong>
         {{ $message }}
     </div>
 </div>
@@ -117,7 +117,7 @@
     <div class="alert alert-warning fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-        <strong>Warning: </strong>
+        <strong>{{ trans('general.notification_warning') }} </strong>
         {{ $message }}
     </div>
 </div>
@@ -129,7 +129,7 @@
     <div class="alert alert-info fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-info-circle faa-pulse animated"></i>
-        <strong>Info: </strong>
+        <strong>{{ trans('general.notification_info') }} </strong>
         {{ $message }}
     </div>
 </div>

resources/views/notifications/markdown/asset-requested.blade.php

@@ -25,7 +25,7 @@
 | **{{ trans('general.status') }}** | {{ $item->assetstatus->name }}
 @endif
 @if ($item->assignedTo)
-| **Checked out to** | {!! $item->assignedTo->present()->nameUrl() !!} ({{ $item->present()->statusMeta }})
+| **{{ trans('general.checked_out_to') }}** | {!! $item->assignedTo->present()->nameUrl() !!} ({{ $item->present()->statusMeta }})
 @endif
 @if (isset($item->manufacturer))
 | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
@@ -40,7 +40,7 @@
 | **{{ trans('mail.serial') }}** | {{ $item->serial }} |
 @endif
 @if ((isset($last_checkout)) && ($last_checkout!=''))
-| **Last Checkout** | {{ $last_checkout }} |
+| **{{ trans('general.last_checkout') }}** | {{ $last_checkout }} |
 @endif
 @if ((isset($expected_checkin)) && ($expected_checkin!=''))
 | **{{ trans('mail.expecting_checkin_date') }}** | {{ $expected_checkin }} |

resources/views/notifications/markdown/report-expected-checkins.blade.php

@@ -1,10 +1,10 @@
 @component('mail::message')
 # {{ trans('mail.hello') }},
 
-The following {{ $assets->count() }} items are due to be checked in soon:
+{{ trans('general.due_to_checkin', array('count' => $assets->count())) }}
 
 @component('mail::table')
-| Asset | Checked Out to | Expected Checkin |
+| {{ trans('general.assets') }} | {{ trans('general.checked_out_to') }} | {{ trans('general.expected_checkin') }} |
 | ------------- | ------------- | ------------- |
 @foreach ($assets as $asset)
 @php

resources/views/notifications/markdown/user-inventory.blade.php

@@ -1,13 +1,12 @@
 @component('mail::message')
 
-This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email {{ config('mail.reply_to.name') }} at {{ config('mail.reply_to.address') }}.
+{{ trans('general.reminder_checked_out_items', array('reply_to_name' => config('mail.reply_to.name'), 'reply_to_address' => config('mail.reply_to.address')))}}
-
 
 @component('mail::table')
 
 @if ($assets->count() > 0)
 
-## {{ $assets->count() }} Assets
+## {{ $assets->count() }} {{ trans('general.assets') }}
 
 <table width="100%">
 <tr><th align="left">{{ trans('mail.name') }} </th><th align="left">{{ trans('mail.asset_tag') }}</th></tr>
@@ -18,7 +17,7 @@ This is a reminder of the items currently checked out to you. If you feel this l
 @endif
 
 @if ($accessories->count() > 0)
-## {{ $accessories->count() }} Accessories
+## {{ $accessories->count() }} {{ trans('general.accessories') }}
 
 <table width="100%">
 <tr><th align="left">{{ trans('mail.name') }} </th></tr>
@@ -29,7 +28,7 @@ This is a reminder of the items currently checked out to you. If you feel this l
 @endif
 
 @if ($licenses->count() > 0)
-## {{ $licenses->count() }} Licenses
+## {{ $licenses->count() }} {{ trans('general.licenses') }}
 
 <table width="100%">
 <tr><th align="left"{{ trans('mail.name') }} </th></tr>

resources/views/partials/bootstrap-table.blade.php

@@ -4,11 +4,12 @@
 @endpush
 
 @push('js')
+
 <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
+
 <script nonce="{{ csrf_token() }}">
-
     $(function () {
-
+        var locale = '{{ config('app.locale') }}';
 
         var stickyHeaderOffsetY = 0;
 
@@ -38,6 +39,7 @@
                 }
             },
             stickyHeader: true,
+            locale: locale,
             stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
             undefinedText: '',
             iconsPrefix: 'fa',
@@ -89,9 +91,6 @@
     });
 
 
-
-
-
     function dateRowCheckStyle(value) {
         if ((value.days_to_next_audit) && (value.days_to_next_audit < {{ $snipeSettings->audit_warning_days ?: 0 }})) {
             return { classes : "danger" }
@@ -232,7 +231,7 @@
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="Clone Item"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
+                actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {
@@ -327,7 +326,7 @@
     function licenseSeatInOutFormatter(value, row) {
         // The user is allowed to check the license seat out and it's available
         if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
-            return '<a href="{{ url('/') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="Check this item out">{{ trans('general.checkout') }}</a>';
+            return '<a href="{{ url('/') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
         } else {
             return '<a href="{{ url('/') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-toggle="tooltip" title="Check in this license seat.">{{ trans('general.checkin') }}</a>';
         }
@@ -339,7 +338,7 @@
 
             // The user is allowed to check items out, AND the item is deployable
             if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
-                    return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="Check this item out">{{ trans('general.checkout') }}</a>';
+                    return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-toggle="tooltip" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
 
             // The user is allowed to check items out, but the item is not deployable
             } else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {

resources/views/partials/forms/edit/category-select.blade.php

@@ -18,7 +18,7 @@
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\Category::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
-                <a href='{{ route('modal.show',['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal"  data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-primary">New</a>
+                <a href='{{ route('modal.show',['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal"  data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
             @endif
         @endcan
     </div>

resources/views/partials/forms/edit/image-upload.blade.php

@@ -14,7 +14,7 @@
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
     <div class="col-md-4 col-md-offset-3" aria-hidden="true">
-        <img id="uploadFile-imagePreview" style="max-width: 200px; display: none;" alt="Uploaded image thumbnail">
+        <img id="uploadFile-imagePreview" style="max-width: 200px; display: none;" alt="{{ trans('partials/forms/general.alt_uploaded_image_thumbnail') }}">
     </div>
 </div>
 

resources/views/partials/forms/edit/kit-select.blade.php

@@ -3,13 +3,13 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="kits" data-placeholder="Select a kit{{-- TODO: trans --}}" name="{{ $fieldname }}" style="width: 100%" id="kit_id_select">
+        <select class="js-data-ajax" data-endpoint="kits" data-placeholder="{{ trans('partials/forms/general.placeholder_kit') }}" name="{{ $fieldname }}" style="width: 100%" id="kit_id_select">
             @if ($kit_id = Request::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $kit_id }}" selected="selected">
                     {{ (\App\Models\User::find($kit_id)) ? \App\Models\User::find($kit_id)->present()->fullName : '' }}
                 </option>
             @else
-                <option value="">Select a kit{{-- TODO: trans --}}</option>
+                <option value="">{{ trans('partials/forms/general.placeholder_kit') }}</option>
             @endif
         </select>
     </div>
@@ -17,7 +17,7 @@
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\PredefinedKit::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
-                {{--  <a href='{{ route('modal.show, 'kit') }}' data-toggle="modal"  data-target="#createModal" data-select='kit_id_select' class="btn btn-sm btn-default">New</a>  --}}
+                {{--  <a href='{{ route('modal.show, 'kit') }}' data-toggle="modal"  data-target="#createModal" data-select='kit_id_select' class="btn btn-sm btn-default">{{ trans('buttons.new') }}</a>  --}}
             @endif
         @endcan
     </div>

resources/views/partials/forms/edit/location-select.blade.php

@@ -17,7 +17,7 @@
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\Location::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
-            <a href='{{ route('modal.show', 'location') }}' data-toggle="modal"  data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-primary">New</a>
+            <a href='{{ route('modal.show', 'location') }}' data-toggle="modal"  data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-primary">{{ trans('general.new') }}</a>
             @endif
         @endcan
     </div>

resources/views/partials/forms/edit/manufacturer-select.blade.php

@@ -19,7 +19,7 @@
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\Manufacturer::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
-                <a href='{{ route('modal.show', 'manufacturer') }}' data-toggle="modal"  data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-primary">New</a>
+                <a href='{{ route('modal.show', 'manufacturer') }}' data-toggle="modal"  data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
             @endif
         @endcan
     </div>

resources/views/partials/forms/edit/model-select.blade.php

@@ -18,7 +18,7 @@
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\AssetModel::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
-                <a href='{{ route('modal.show', 'model') }}' data-toggle="modal"  data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-primary">New</a>
+                <a href='{{ route('modal.show', 'model') }}' data-toggle="modal"  data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
                 <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
                     <i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
                 </span>

resources/views/partials/forms/edit/purchase_date.blade.php

@@ -1,7 +1,7 @@
 <!-- Purchase Date -->
 <div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
    <label for="purchase_date" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
-   <div class="input-group col-md-3">
+   <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}">
             <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>