Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO

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,
             ],
             [

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

@@ -15,10 +15,36 @@ return [
     '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',
+    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable' => 'Update appended Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license' => 'Append license',
+    'append_license'                    => 'Append license',
-    'update_appended_license' => 'Update appended license',
+    'update_appended_license'           => 'Update appended license',
-    'append_model' => 'Append model',
+    'append_model'                      => 'Append model',
-    'update_appended_model' => 'Update appended 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/table.php

@@ -20,9 +20,7 @@ return [
     'parent'                    => 'Parent',
     'currency'                  => 'Location Currency',
     'ldap_ou'                   => 'LDAP Search OU',
-    'company'                   => 'Company',
     'user_name'                 => 'User Name',
-    'employee_num'              => 'Employee No.',
     'department'                => 'Department',
     'location'                  => 'Location',
     'asset_tag'                 => 'Assets Tag',
@@ -37,5 +35,6 @@ return [
     '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_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
 ];

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

@@ -319,4 +319,14 @@ return [
     '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

@@ -37,6 +37,7 @@ return [
         '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.'
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong.',
     ]
 ];

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/general.php

@@ -36,6 +36,7 @@
     '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',
@@ -91,7 +92,6 @@
     'details'               => 'Details',
     'download'				=> 'Download',
     'download_all'		    => 'Download All',
-    'edit'                  => 'Edit',
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
@@ -292,6 +292,7 @@
     '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',
@@ -304,4 +305,41 @@
             <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:',
 ];

resources/views/dashboard.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- 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/hardware/view.blade.php

@@ -974,9 +974,9 @@
                                     <div id="toolbar">
                                         <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">{{ trans('general.edit') }}</option>
+                                            <option value="edit">{{ trans('button.edit') }}</option>
-                                            <option value="delete">{{ trans('general.delete')}}</option>
+                                            <option value="delete">{{ trans('button.delete')}}</option>
-                                            <option value="labels">{{ trans('general.generate_labels') }}</option>
+                                            <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
                                         </select>
                                         <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                                     </div>

resources/views/licenses/view.blade.php

@@ -454,7 +454,7 @@
                     }'>
             <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>
@@ -498,7 +498,7 @@
                   @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">{{ trans('general.delete') }}</span>
                   </a>

resources/views/locations/print.blade.php

@@ -73,9 +73,9 @@
         <thead>
             <tr>
             <th style="width: 5px;"></th>
-            <th style="width: 25%;">{{ trans('admin/locations/table.company') }}</th>
+            <th style="width: 25%;">{{ trans('general.company') }}</th>
             <th style="width: 25%;">{{ trans('admin/locations/table.user_name') }}</th>
-            <th style="width: 10%;">{{ trans('admin/locations/table.employee_num') }}</th>
+            <th style="width: 10%;">{{ trans('general.employee_number') }}</th>
 	        <th style="width: 20%;">{{ trans('admin/locations/table.department') }}</th>
 		    <th style="width: 20%;">{{ trans('admin/locations/table.location') }}</th>
             </tr>

resources/views/models/view.blade.php

@@ -51,9 +51,9 @@
                       'id' => 'bulkForm']) }}
                   <div id="toolbar">
                       <select name="bulk_actions" class="form-control select2">
-                          <option value="edit">{{ trans('general.edit') }}</option>
+                          <option value="edit">{{ trans('button.edit') }}</option>
-                          <option value="delete">{{ trans('general.delete') }}</option>
+                          <option value="delete">{{ trans('button.delete') }}</option>
-                          <option value="labels">{{ trans('general.generate_labels') }}</option>
+                          <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
                       </select>
                       <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                   </div>

resources/views/notifications.blade.php

@@ -1,11 +1,10 @@
-{{-- TODO: Translate --}}
 @if ($errors->any())
 <div class="col-md-12">
     <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>
 
@@ -17,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>
@@ -29,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>
@@ -42,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>
@@ -65,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
@@ -79,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
@@ -92,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>
@@ -105,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>
@@ -118,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>
@@ -130,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/reports/asset.blade.php

@@ -43,7 +43,7 @@
                                 <th data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
                                 <th data-sortable="true" data-field="status_label">{{ trans('admin/hardware/table.status') }}</th>
                                 <th data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
-                                <th data-sortable="true" data-field="employee_number">{{ trans('admin/users/table.employee_num') }}</th>
+                                <th data-sortable="true" data-field="employee_number">{{ trans('general.employee_number') }}</th>
                                 <th data-sortable="true" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
                                 <th data-sortable="true" data-field="category" data-searchable="true">{{ trans('general.category') }}</th>
                                 <th data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>

resources/views/reports/custom.blade.php

@@ -217,7 +217,7 @@
             <div class="checkbox col-md-12">
               <label>
                 {{ Form::checkbox('employee_num', '1', '1', ['class' => 'minimal']) }}
-                {{ trans('admin/users/table.employee_num') }}
+                {{ trans('general.employee_number') }}
               </label>
             </div>
 

resources/views/settings/slack.blade.php

@@ -106,7 +106,7 @@
                                 {{ Form::label('test_slack', 'Test Slack') }}
                             </div>
                             <div class="col-md-10" id="slacktestrow">
-                                <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test <i class="fab fa-slack"></i> Integration</a>
+                                <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">{!! trans('admin/settings/general.slack_test') !!}</a>
                             </div>
                             <div class="col-md-10 col-md-offset-2">
                                 <span id="slacktesticon"></span>
@@ -213,7 +213,7 @@
                         var error_msg = data.responseJSON.message;
                     } else {
                         var errors;
-                        var error_msg = 'Something went wrong.';
+                        var error_msg = trans('admin/settings/message.slack.error');
                     }
 
                     var error_text = '';
@@ -227,7 +227,6 @@
                     if (data.status == 500) {
                         $('#slackteststatus').html('{{  trans('admin/settings/message.slack.500') }}');
                     } else if ((data.status == 400) || (data.status == 422)) {
-                        // TODO: Needs translation
                         console.log('Type of errors is '+ typeof errors);
                         console.log('Data status was 400 or 422');
 

resources/views/setup/done.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts/setup')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
-Create a User ::
+{{ trans('general.create_admin_user') }}
 @parent
 @stop
 
@@ -12,9 +11,9 @@ Create a User ::
 	<div class="col-md-12">
         <div class="alert alert-warning">
             <i class="fas fa-check"></i>
-            Success! Your admin user has been added!
+            {{ trans('general.create_admin_success') }}
         </div>
     </div>
-    <p>Click here to go to your app login! <a href="{{ url('/') }}">{{ url('/') }}</a></p>
+    <p>{{ trans('general.create_admin_redirect') }} <a href="{{ url('/') }}">{{ url('/') }}</a></p>
 </div>
 @stop

resources/views/setup/migrate.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts/setup')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
-Create a User ::
+{{ trans('gerneral.setup_migrations') }}
 @parent
 @stop
 
@@ -13,27 +12,27 @@ Create a User ::
     <div class="col-md-12">
         <div class="alert alert-warning">
             <i class="fas fa-exclamation-triangle"></i>
-            There was nothing to migrate. Your database tables were already set up!
+            {{ trans('gerneral.setup_no_migrations') }}
         </div>
     </div>
     @else
     <div class="col-md-12">
         <div class="alert alert-success">
             <i class="fas fa-check"></i>
-            Your database tables have been created
+            {{ trans('gerneral.setup_successful_migrations') }}
         </div>
     </div>
 
     @endif
 
-    <p>Migration output: </p>
+    <p>{{ trans('gerneral.setup_migration_output') }} </p>
     <pre>{{ $output }}</pre>
 </div>
 @stop
 
 @section('button')
   <form action="{{ route('setup.user') }}" method="GET">
-    <button class="btn btn-primary">Next: Create User</button>
+    <button class="btn btn-primary">{{ trans('gerneral.setup_migrations_create_user') }}</button>
   </form>
 @parent
 @stop

resources/views/statuslabels/index.blade.php

@@ -3,8 +3,6 @@
     'helpPosition' => 'right',
 ])
 
-{{-- TODO: Translate --}}
-
 {{-- Page title --}}
 @section('title')
 {{ trans('admin/statuslabels/table.title') }}
@@ -75,18 +73,18 @@
 
       <div class="box box-warning">
           <div class="box-body">
-              <p><i class="fas fa-circle text-orange"></i> <strong>Pending</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
+              <p><i class="fas fa-circle text-orange"></i> <strong>{{ trans('admin/statuslabels/table.pending') }}</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
           </div>
       </div>
       <div class="box box-danger">
           <div class="box-body">
-            <p><i class="fas fa-times text-red"></i> <strong>Undeployable</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
+            <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.undeployable') }}</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
           </div>
       </div>
 
       <div class="box box-danger">
           <div class="box-body">
-              <p><i class="fas fa-times text-red"></i> <strong>Archived</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>
+              <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.archived') }}</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>
           </div>
       </div>
 

resources/views/statuslabels/view.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
     {{ $statuslabel->name }} {{ trans('general.assets') }}
@@ -23,11 +22,11 @@
                             @if (Request::get('status')!='Deleted')
                                 <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', 1) }}</option>
                                     </select>
-                                    <button class="btn btn-default" id="bulkEdit" disabled>Go</button>
+                                    <button class="btn btn-default" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                                 </div>
                             @endif
 

resources/views/suppliers/view.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
 {{ trans('admin/suppliers/table.view') }} -
@@ -155,7 +154,7 @@
           @if ($supplier->id)
             <div class="box-header with-border">
               <div class="box-heading">
-                <h2 class="box-title"> Improvements</h2>
+                <h2 class="box-title"> {{ trans('general.improvements') }}</h2>
               </div>
             </div><!-- /.box-header -->
           @endif

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

@@ -1,8 +1,7 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
-    Bulk Edit
+    {{ trans('general.bulk_edit') }}
     @parent
 @stop
 
@@ -67,14 +66,14 @@
                         <!-- activated -->
                         <div class="form-group">
                             <div class="col-sm-3 control-label">
-                                Activated
+                                {{ trans('general.activated') }}
                             </div>
                             <div class="col-sm-9">
                                 <div class="checkbox">
                                     <label for="activated">
-                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated']) }} Do not change activation status <br>
+                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated']) }} {{  trans('admin/users/general.activation_status_warning') }} <br>
                                         {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('general.login_enabled')}} <br>
-                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }}  User is de-activated
+                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('admin/users/general.user_deactivated')}}
 
                                     </label>
                                 </div>
@@ -88,11 +87,11 @@
                             <div class="col-md-6">
                                 @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
 
-                                    <span class="help-block">Only superadmins may edit group memberships.</p>
+                                    <span class="help-block">{{  trans('admin/users/general.group_memberships_helpblock') }}</p>
                                 @else
                                     <div class="controls">
                                         <select name="groups[]" id="groups[]" multiple="multiple" class="form-control" aria-label="groups">
-                                        <option value="">Remove Group Memberships </option>
+                                        <option value="">{{  trans('admin/users/general.remove_group_memberships') }} </option>
 
                                   @foreach ($groups as $id => $group)
                                         <option value="{{ $id }}">{{ $group }} </option>

resources/views/users/confirm-bulk-delete.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
-Bulk Checkin & Delete
+{!! trans('general.bulk_checkin_delete') !!}
 @parent
 @stop
 
@@ -19,8 +18,8 @@ Bulk Checkin & Delete
           <div class="col-md-12">
             <div class="callout callout-danger">
               <i class="fas fa-exclamation-triangle"></i>
-              <strong>WARNING: </strong>
+              <strong>{{ trans('admin/users/general.warning_deletion') }} </strong>
-              You are about to delete the {{ count($users) }} user(s) listed below. Super admin names are highlighted in red.
+              {{ trans('admin/users/general.warning_deletion_information', array('count' => count($users))) }}
             </div>
           </div>
 
@@ -38,11 +37,11 @@ Bulk Checkin &amp; Delete
                 <thead>
                   <tr>
                     <th class="col-md-1"></th>
-                    <th class="col-md-6">Name</th>
+                    <th class="col-md-6">{{ trans('general.name') }}</th>
-                    <th class="col-md-5">Groups</th>
+                    <th class="col-md-5">{{ trans('general.groups') }}</th>
-                    <th class="col-md-5">Assets</th>
+                    <th class="col-md-5">{{ trans('general.assets') }}</th>
-                    <th class="col-md-5">Accessories</th>
+                    <th class="col-md-5">{{ trans('general.accessories') }}</th>
-                    <th class="col-md-5">Licenses</th>
+                    <th class="col-md-5">{{ trans('general.licenses') }}</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -85,12 +84,12 @@ Bulk Checkin &amp; Delete
                   <tr>
                     <td colspan="6" class="warning">
                       {{ Form::select('status_id', $statuslabel_list , Request::old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
-                      <label>Update all assets for these users to this status</label>
+                      <label>{{ trans('admin/users/general.update_user_assets_status') }}</label></label>
                     </td>
                   </tr>
                   <tr>
                     <td colspan="6" class="warning">
-                      <label><input type="checkbox" name="ids['.e($user->id).']" checked> Check in all properties associated with these users</label>
+                      <label><input type="checkbox" name="ids['.e($user->id).']" checked>{{ trans('admin/users/general.checkin_user_properties') }}</label>
                     </td>
                   </tr>
                 </tfoot>

resources/views/users/edit.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
 	@if ($user->id)
@@ -76,8 +75,8 @@
         <!-- Custom Tabs -->
       <div class="nav-tabs-custom">
         <ul class="nav nav-tabs">
-          <li class="active"><a href="#tab_1" data-toggle="tab">Information</a></li>
+          <li class="active"><a href="#tab_1" data-toggle="tab">{{ trans('general.information') }} </a></li>
-          <li><a href="#permissions" data-toggle="tab">Permissions</a></li>
+          <li><a href="#permissions" data-toggle="tab">{{ trans('general.permissions') }} </a></li>
         </ul>
 
         <div class="tab-content">
@@ -122,7 +121,7 @@
                         <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
                       @endif
                     @else
-                      (Managed via LDAP)
+                      {{ trans('general.managed_ldap') }}
                           <input type="hidden" name="username" value="{{ Request::old('username', $user->username) }}">
 
                     @endif
@@ -149,14 +148,14 @@
                         onfocus="this.removeAttribute('readonly');"
                         {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}>
                     @else
-                      (Managed via LDAP)
+                      {{ trans('general.managed_ldap') }}
                     @endif
                     <span id="generated-password"></span>
                     {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                   </div>
                   <div class="col-md-2">
                     @if ($user->ldap_import!='1')
-                      <a href="#" class="left" id="genPassword">Generate</a>
+                      <a href="#" class="left" id="genPassword">{{ trans('general.generate') }}</a>
                     @endif
                   </div>
                 </div>
@@ -301,7 +300,7 @@
 
                 <!-- Employee Number -->
                 <div class="form-group {{ $errors->has('employee_num') ? 'has-error' : '' }}">
-                  <label class="col-md-3 control-label" for="employee_num">{{ trans('admin/users/table.employee_num') }}</label>
+                  <label class="col-md-3 control-label" for="employee_num">{{ trans('general.employee_number') }}</label>
                   <div class="col-md-6">
                     <input
                       class="form-control"
@@ -472,7 +471,7 @@
                                   </ul>
                               @endif
 
-                              <span class="help-block">Only superadmins may edit group memberships.</p>
+                              <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</p>
                                   @else
                                       <div class="controls">
                         <select
@@ -507,21 +506,21 @@
           <div class="tab-pane" id="permissions">
             <div class="col-md-12">
               @if (!Auth::user()->isSuperUser())
-                <p class="alert alert-warning">Only superadmins may grant a user superadmin access.</p>
+                <p class="alert alert-warning">{{ trans('admin/users/general.superadmin_permission_warning') }}</p>
               @endif
 
               @if (!Auth::user()->hasAccess('admin'))
-                <p class="alert alert-warning">Only users with admins rights or greater may grant a user admin access.</p>              
+                <p class="alert alert-warning">{{ trans('admin/users/general.admin_permission_warning') }}</p>
               @endif
             </div>
 
             <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>
-                  <th class="col-md-1">Inherit</th>
+                  <th class="col-md-1">{{ trans('admin/users/table.inherit') }}</th>
                 </tr>
               </thead>
                 @include('partials.forms.edit.permissions-base')

resources/views/users/index.blade.php

@@ -1,5 +1,4 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
 
@@ -17,7 +16,7 @@
 
     @can('create', \App\Models\User::class)
         @if ($snipeSettings->ldap_enabled == 1)
-            <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fas fa-sitemap"></span> LDAP Sync</a>
+            <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fas fa-sitemap"></span>{{trans('general.ldap_sync')}}</a>
         @endif
         <a href="{{ route('users.create') }}" class="btn btn-primary pull-right" style="margin-right: 5px;">  {{ trans('general.create') }}</a>
     @endcan
@@ -28,7 +27,7 @@
         <a class="btn btn-default pull-right" href="{{ route('users.index', ['status' => 'deleted']) }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_deleted') }}</a>
     @endif
     @can('view', \App\Models\User::class)
-        <a class="btn btn-default pull-right" href="{{ route('users.export') }}" style="margin-right: 5px;">Export</a>
+        <a class="btn btn-default pull-right" href="{{ route('users.export') }}" style="margin-right: 5px;">{{ trans('general.export') }}</a>
     @endcan
 @stop
 
@@ -48,13 +47,13 @@
             @if (request('status')!='deleted')
               @can('delete', \App\Models\User::class)
                 <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" style="width: 200px;" aria-label="bulk_actions">
-                    <option value="delete">Bulk Checkin &amp; Delete</option>
+                    <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
-                    <option value="edit">Bulk Edit</option>
+                    <option value="edit">{{ trans('general.bulk_edit') }}</option>
                     <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
                   </select>
-                  <button class="btn btn-default" id="bulkEdit" disabled>Go</button>
+                  <button class="btn btn-default" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
                 </div>
               @endcan
             @endif

resources/views/users/ldap.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts/default')
-{{-- TODO: Translate --}}
 {{-- Page title --}}
 @section('title')
-LDAP User Sync
+{{ trans('general.ldap_user_sync') }}
 @parent
 @stop
 
@@ -40,7 +39,7 @@ LDAP User Sync
                 </div>
                 <div class="text-right col-md-6">
                     <button type="submit" class="btn btn-primary" id="sync">
-                        <i id="sync-button-icon" class="fas fa-sync-alt icon-white" aria-hidden="true"></i> <span id="sync-button-text">Synchronize</span>
+                        <i id="sync-button-icon" class="fas fa-sync-alt icon-white" aria-hidden="true"></i> <span id="sync-button-text">{{ trans('general.synchronize') }}</span>
                     </button>
                 </div>
 
@@ -54,7 +53,7 @@ LDAP User Sync
     <p>
         {{ trans('admin/users/general.ldap_config_text') }}
     </p>
-  <p><a href="{{ route('settings.ldap.index') }}">LDAP Settings Page</a></p>
+  <p><a href="{{ route('settings.ldap.index') }}">{{ trans('admin/settings/general.ldap_settings_link') }}</a></p>
   </div>
 </div>
 
@@ -64,14 +63,14 @@ LDAP User Sync
 
     <div class="box box-default">
       <div class="box-header with-border">
-        <h2 class="box-title">Synchronization Results</h2>
+        <h2 class="box-title">{{ trans('general.sync_results') }}</h2>
       </div><!-- /.box-header -->
       <div class="box-body">
         <table class="table table-bordered">
           <tr>
-              <th>Username</th><th>Employee Number</th>
+              <th>{{ trans('general.username') }}</th><th>{{ trans('general.employee_number') }}</th>
-              <th>First Name</th><th>Last Name</th>
+              <th>{{ trans('general.firstname') }}</th><th>{{ trans('general.lastname') }}</th>
-              <th>Email</th><th>Notes</th>
+              <th>{{ trans('general.email') }}</th><th>{{ trans('general.notes') }}</th>
           </tr>
 
           @foreach (Session::get('summary') as $entry)
@@ -110,7 +109,7 @@ LDAP User Sync
             $("#sync").removeClass("btn-warning");
             $("#sync").addClass("btn-success");
             $("#sync-button-icon").addClass("fa-spin");
-            $("#sync-button-text").html(" Processing...");
+            $("#sync-button-text").html("{{ trans('general.processing') }}");
         });
     });
 </script>

resources/views/users/print.blade.php

@@ -30,7 +30,6 @@
     </style>
 </head>
 <body>
-{{-- TODO: Translate --}}
 @if ($snipeSettings->logo_print_assets=='1')
     @if ($snipeSettings->brand == '3')
 
@@ -64,12 +63,12 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 20%;">Asset Tag</th>
+                <th style="width: 20%;">{{ trans('general.asset_tag') }}</th>
-                <th style="width: 20%;">Name</th>
+                <th style="width: 20%;">{{ trans('general.name') }}</th>
-                <th style="width: 10%;">Category</th>
+                <th style="width: 10%;">{{ trans('general.category') }}</th>
-                <th style="width: 20%;">Model</th>
+                <th style="width: 20%;">{{ trans('general.asset_model') }}</th>
-                <th style="width: 20%;">Serial</th>
+                <th style="width: 20%;">{{ trans('general.asset_serial') }}</th>
-                <th style="width: 10%;">Checked Out</th>
+                <th style="width: 10%;">{{ trans('general.checked_out') }}</th>
                 <th data-formatter="imageFormatter" style="width: 20%;">{{ trans('general.signature') }}</th>
             </tr>
         </thead>
@@ -131,9 +130,9 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 40%;">Name</th>
+                <th style="width: 40%;">{{ trans('general.name') }}</th>
-                <th style="width: 50%;">Serial/Product Key</th>
+                <th style="width: 50%;">{{ trans('general.license_serial') }}</th>
-                <th style="width: 10%;">Checked Out</th>
+                <th style="width: 10%;">{{ trans('general.checked_out') }}</th>
             </tr>
         </thead>
         @php
@@ -173,9 +172,9 @@
         <thead>
             <tr>
                 <th style="width: 20px;"></th>
-                <th style="width: 40%;">Name</th>
+                <th style="width: 40%;">{{ trans('general.name') }}</th>
-                <th style="width: 50%;">Category</th>
+                <th style="width: 50%;">{{ trans('general.category') }}</th>
-                <th style="width: 10%;">Checked Out</th>
+                <th style="width: 10%;">{{ trans('general.checked_out') }}</th>
             </tr>
         </thead>
         @php
@@ -209,9 +208,9 @@
         <thead>
         <tr>
             <th style="width: 20px;"></th>
-            <th style="width: 40%;">Name</th>
+            <th style="width: 40%;">{{ trans('general.name') }}</th>
-            <th style="width: 50%;">Category</th>
+            <th style="width: 50%;">{{ trans('general.category') }}</th>
-            <th style="width: 10%;">Checked Out</th>
+            <th style="width: 10%;">{{ trans('general.checked_out') }}</th>
         </tr>
         </thead>
         @php
@@ -231,7 +230,7 @@
                         {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }}  {{ $consumable->name }} {{ $consumable->model_number }}
                     @endif
                 </td>
-                    <td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
+                    <td>{{ ($consumable->category) ? $consumable->category->name : '{{ trans('general.invalid_category') }}' }} </td>
                     <td>{{  $consumable->assetlog->first()->created_at }}</td>
                 </tr>
                 @php
@@ -247,10 +246,10 @@
 <br>
 <table>
     <tr>
-        <td>Signed Off By:</td>
+        <td>{{ trans('admin/locations/table.signed_by') }}</td>
         <td>________________________________________________________</td>
         <td></td>
-        <td>Date:</td>
+        <td>{{ trans('general.date') }}</td>
         <td>________________________________________________________</td>
     </tr>
 </table>

resources/views/users/view.blade.php

@@ -345,7 +345,7 @@
                       <div class="row">
 
                         <div class="col-md-3">
-                          {{ trans('admin/users/table.employee_num') }}
+                          {{ trans('general.employee_number') }}
                         </div>
                         <div class="col-md-9">
                           {{ $user->employee_num }}