Add @ColinMcNeil as a contributor

Vuln in SVG sanitizer library

.all-contributorsrc

@@ -1668,6 +1668,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Godmartinz",
+      "name": "Godfrey Martinez",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/47435081?v=4",
+      "profile": "https://github.com/Godmartinz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bigtreeEdo",
+      "name": "bigtreeEdo",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/2075128?v=4",
+      "profile": "https://github.com/bigtreeEdo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ColinMcNeil",
+      "name": "Colin  McNeil",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/5000430?v=4",
+      "profile": "https://colinmcneil.me/",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.env.example

@@ -26,6 +26,7 @@ DB_COLLATION=utf8mb4_unicode_ci
 # OPTIONAL: SSL DATABASE SETTINGS
 # --------------------------------------------
 DB_SSL=false
+DB_SSL_IS_PAAS=false
 DB_SSL_KEY_PATH=null
 DB_SSL_CERT_PATH=null
 DB_SSL_CA_PATH=null
@@ -116,3 +117,5 @@ FILESYSTEM_DISK=local
 APP_CIPHER=AES-256-CBC
 GOOGLE_MAPS_API=
 BACKUP_ENV=true
+LDAP_MEM_LIM=500M
+LDAP_TIME_LIM=600

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=master)](https://travis-ci.org/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-182-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)
+[![All Contributors](https://img.shields.io/badge/all_contributors-185-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)
 
 
 ## Snipe-IT - Open Source Asset Management System
@@ -106,6 +106,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars0.githubusercontent.com/u/1680266?v=4" width="110px;"/><br /><sub>saymd</sub>](https://github.com/saymd)<br />[🌍](#translation-saymd "Translation") | [<img src="https://avatars0.githubusercontent.com/u/1826808?v=4" width="110px;"/><br /><sub>Patrik Larsson</sub>](https://nordsken.se)<br />[🌍](#translation-pooot "Translation") | [<img src="https://avatars1.githubusercontent.com/u/20584746?v=4" width="110px;"/><br /><sub>drcryo</sub>](https://github.com/drcryo)<br />[🌍](#translation-drcryo "Translation") | [<img src="https://avatars1.githubusercontent.com/u/19408004?v=4" width="110px;"/><br /><sub>pawel1615</sub>](https://github.com/pawel1615)<br />[🌍](#translation-pawel1615 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/23340468?v=4" width="110px;"/><br /><sub>bodrovics</sub>](https://github.com/bodrovics)<br />[🌍](#translation-bodrovics "Translation") | [<img src="https://avatars0.githubusercontent.com/u/3257654?v=4" width="110px;"/><br /><sub>priatna</sub>](https://github.com/priatna)<br />[🌍](#translation-priatna "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5358374?v=4" width="110px;"/><br /><sub>Fan Jiang</sub>](https://amayume.net)<br />[🌍](#translation-ProfFan "Translation") |
 | [<img src="https://avatars1.githubusercontent.com/u/22555451?v=4" width="110px;"/><br /><sub>ragnarcx</sub>](https://github.com/ragnarcx)<br />[🌍](#translation-ragnarcx "Translation") | [<img src="https://avatars2.githubusercontent.com/u/18654582?v=4" width="110px;"/><br /><sub>Rein van Haaren</sub>](http://www.reinvanhaaren.nl/)<br />[🌍](#translation-reinvanhaaren "Translation") | [<img src="https://avatars1.githubusercontent.com/u/386672?v=4" width="110px;"/><br /><sub>Teguh Dwicaksana</sub>](http://dheche.songolimo.net)<br />[🌍](#translation-dheche "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2572552?v=4" width="110px;"/><br /><sub>fraccie</sub>](https://github.com/FRaccie)<br />[🌍](#translation-FRaccie "Translation") | [<img src="https://avatars0.githubusercontent.com/u/35182720?v=4" width="110px;"/><br /><sub>vinzruzell</sub>](https://github.com/vinzruzell)<br />[🌍](#translation-vinzruzell "Translation") | [<img src="https://avatars1.githubusercontent.com/u/7883603?v=4" width="110px;"/><br /><sub>Kevin Austin</sub>](http://kevinaustin.com)<br />[🌍](#translation-vipsystem "Translation") | [<img src="https://avatars3.githubusercontent.com/u/3861828?v=4" width="110px;"/><br /><sub>Wira Sandy</sub>](http://azuraweb.xyz)<br />[🌍](#translation-wira-sandy "Translation") |
 | [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") | [<img src="https://avatars0.githubusercontent.com/u/17459600?v=4" width="110px;"/><br /><sub>Marián Skrip</sub>](https://github.com/mskrip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mskrip "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/47435081?v=4" width="110px;"/><br /><sub>Godfrey Martinez</sub>](https://github.com/Godmartinz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Godmartinz "Code") | [<img src="https://avatars1.githubusercontent.com/u/2075128?v=4" width="110px;"/><br /><sub>bigtreeEdo</sub>](https://github.com/bigtreeEdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bigtreeEdo "Code") | [<img src="https://avatars0.githubusercontent.com/u/5000430?v=4" width="110px;"/><br /><sub>Colin  McNeil</sub>](https://colinmcneil.me/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ColinMcNeil "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/LdapSync.php

@@ -42,9 +42,8 @@ class LdapSync extends Command
      */
     public function handle()
     {
-        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
-        ini_set('memory_limit', '500M');
-
+        ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
+        ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
         $ldap_result_username = Setting::getSettings()->ldap_username_field;
         $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
         $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;

app/Http/Controllers/AccessoriesController.php

@@ -85,26 +85,7 @@ class AccessoriesController extends Controller
         $accessory->qty                     = request('qty');
         $accessory->user_id                 = Auth::user()->id;
         $accessory->supplier_id             = request('supplier_id');
-
-        if ($request->hasFile('image')) {
-
-            if (!config('app.lock_passwords')) {
-                $image = $request->file('image');
-                $ext = $image->getClientOriginalExtension();
-                $file_name = "accessory-".str_random(18).'.'.$ext;
-                $path = public_path('/uploads/accessories');
-                if ($image->getClientOriginalExtension()!='svg') {
-                    Image::make($image->getRealPath())->resize(null, 800, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    })->save($path.'/'.$file_name);
-                } else {
-                    $image->move($path, $file_name);
-                }
-                $accessory->image = $file_name;
-            }
-        }
-
+        $accessory = $request->handleImages($accessory,600, public_path().'/uploads/accessories');
 
 
         // Was the accessory created?
@@ -165,28 +146,7 @@ class AccessoriesController extends Controller
         $accessory->qty                     = request('qty');
         $accessory->supplier_id             = request('supplier_id');
 
-        if ($request->hasFile('image')) {
-
-            if (!config('app.lock_passwords')) {
-                $image = $request->file('image');
-                $ext = $image->getClientOriginalExtension();
-                $file_name = "accessory-".str_random(18).'.'.$ext;
-                $path = public_path('/uploads/accessories');
-                if ($image->getClientOriginalExtension()!='svg') {
-                    Image::make($image->getRealPath())->resize(null, 800, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    })->save($path.'/'.$file_name);
-                } else {
-                    $image->move($path, $file_name);
-                }
-                if (($accessory->image) && (file_exists($path.'/'.$accessory->image))) {
-                    unlink($path.'/'.$accessory->image);
-                }
-
-                $accessory->image = $file_name;
-            }
-        }
+        $accessory = $request->handleImages($accessory,600, public_path().'/uploads/accessories');
 
 
         // Was the accessory updated?

app/Http/Controllers/Api/AccessoriesController.php

@@ -49,7 +49,9 @@ class AccessoriesController extends Controller
             $accessories->where('supplier_id','=',$request->input('supplier_id'));
         }
 
-        $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/AssetMaintenancesController.php

@@ -44,7 +44,9 @@ class AssetMaintenancesController extends Controller
             $maintenances->where('asset_id', '=', $request->input('asset_id'));
         }
 
-        $offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($maintenances) && ($request->get('offset') > $maintenances->count())) ? $maintenances->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/AssetModelsController.php

@@ -60,7 +60,9 @@ class AssetModelsController extends Controller
             $assetmodels->TextSearch($request->input('search'));
         }
 
-        $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($assetmodels) && ($request->get('offset') > $assetmodels->count())) ? $assetmodels->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/AssetsController.php

@@ -144,7 +144,11 @@ class AssetsController extends Controller
 
         $request->filled('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
 
-        $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0);
+
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($assets) && ($request->get('offset') > $assets->count())) ? $assets->count() : $request->get('offset', 0);
+
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
@@ -525,6 +529,10 @@ class AssetsController extends Controller
                     $location = $target->location_id;
                 } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
                     $location = $target->location_id;
+
+                    Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $id)
+                        ->update(['location_id' => $target->location_id]);
+
                 } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                     $location = $target->id;
                 }

app/Http/Controllers/Api/CategoriesController.php

@@ -30,7 +30,9 @@ class CategoriesController extends Controller
             $categories = $categories->TextSearch($request->input('search'));
         }
 
-        $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($categories) && ($request->get('offset') > $categories->count())) ? $categories->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/CompaniesController.php

@@ -41,7 +41,9 @@ class CompaniesController extends Controller
             $companies->TextSearch($request->input('search'));
         }
 
-        $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($companies) && ($request->get('offset') > $companies->count())) ? $companies->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/ComponentsController.php

@@ -43,7 +43,9 @@ class ComponentsController extends Controller
             $components->where('location_id','=',$request->input('location_id'));
         }
 
-        $offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/ConsumablesController.php

@@ -44,7 +44,9 @@ class ConsumablesController extends Controller
         }
 
 
-        $offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($consumables) && ($request->get('offset') > $consumables->count())) ? $consumables->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/DepartmentsController.php

@@ -15,7 +15,7 @@ class DepartmentsController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @author [Godfrey Martinez] [<snipe@snipe.net>]
      * @since [v4.0]
      * @return \Illuminate\Http\Response
      */
@@ -39,7 +39,9 @@ class DepartmentsController extends Controller
             $departments = $departments->TextSearch($request->input('search'));
         }
 
-        $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($departments) && ($request->get('offset') > $departments->count())) ? $departments->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
@@ -161,5 +163,28 @@ class DepartmentsController extends Controller
         return (new SelectlistTransformer)->transformSelectlist($departments);
 
     }
+    /**
+     * Update the specified resource in storage.
+     *
+     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
+     * @since [v4.0]
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $this->authorize('update', Department::class);
+        $departments = Department::findOrFail($id);
+        $departments->fill($request->all());
+
+        if ($departments->save()) {
+            return response()
+                ->json(Helper::formatStandardApiResponse('success', (new DepartmentsTransformer())->transformdepartment($departments), trans('admin/departments/message.update.success')));
+        }
+
+        return response()
+            ->json(Helper::formatStandardApiResponse('error', null, $departments->getErrors()));
+    }
 
 }

app/Http/Controllers/Api/DepreciationsController.php

@@ -28,7 +28,9 @@ class DepreciationsController extends Controller
             $depreciations = $depreciations->TextSearch($request->input('search'));
         }
 
-        $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($depreciations) && ($request->get('offset') > $depreciations->count())) ? $depreciations->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/GroupsController.php

@@ -28,7 +28,9 @@ class GroupsController extends Controller
             $groups = $groups->TextSearch($request->input('search'));
         }
 
-        $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($groups) && ($request->get('offset') > $groups->count())) ? $groups->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/LicensesController.php

@@ -82,7 +82,9 @@ class LicensesController extends Controller
         }
 
 
-        $offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($licenses) && ($request->get('offset') > $licenses->count())) ? $licenses->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
@@ -228,14 +230,21 @@ class LicensesController extends Controller
 
             $this->authorize('view', $license);
 
-            $seats = LicenseSeat::where('license_id', $licenseId)->with('license', 'user', 'asset');
+            $seats = LicenseSeat::where('license_seats.license_id', $licenseId)
+                ->with('license', 'user', 'asset', 'user.department');
 
-            $offset = (($seats) && (request('offset') > $seats->count())) ? 0 : request('offset', 0);
-
-            $limit = request('limit', 50);
             $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
+            if ($request->input('sort')=='department') {
+                $seats->OrderDepartments($order);
+            } else {
+                $seats->orderBy('id', $order);
+            }
+
             $total = $seats->count();
+            $offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0);
+            $limit = request('limit', 50);
+            
             $seats = $seats->skip($offset)->take($limit)->get();
 
             if ($seats) {

app/Http/Controllers/Api/LocationsController.php

@@ -52,8 +52,9 @@ class LocationsController extends Controller
         }
 
 
-
-        $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($locations) && ($request->get('offset') > $locations->count())) ? $locations->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
@@ -232,23 +233,28 @@ class LocationsController extends Controller
         }
 
         if ($request->filled('search')) {
-            \Log::debug('Searching... ');
             $locations = $locations->where('locations.name', 'LIKE', '%'.$request->input('search').'%');
         }
 
         $locations = $locations->orderBy('name', 'ASC')->get();
 
         $locations_with_children = [];
+
         foreach ($locations as $location) {
-            if(!array_key_exists($location->parent_id, $locations_with_children)) {
+            if (!array_key_exists($location->parent_id, $locations_with_children)) {
                 $locations_with_children[$location->parent_id] = [];
             }
             $locations_with_children[$location->parent_id][] = $location;
         }
 
-        $location_options = Location::indenter($locations_with_children);
+        if ($request->filled('search')) {
+            $locations_formatted =  $locations;
+        } else {
+            $location_options = Location::indenter($locations_with_children);
+            $locations_formatted = new Collection($location_options);
+
+        }
 
-        $locations_formatted = new Collection($location_options);
         $paginated_results =  new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []);
 
         //return [];

app/Http/Controllers/Api/ManufacturersController.php

@@ -37,9 +37,9 @@ class ManufacturersController extends Controller
         }
 
 
-
-
-        $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($manufacturers) && ($request->get('offset') > $manufacturers->count())) ? $manufacturers->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/StatuslabelsController.php

@@ -30,7 +30,9 @@ class StatuslabelsController extends Controller
             $statuslabels = $statuslabels->TextSearch($request->input('search'));
         }
 
-        $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/SuppliersController.php

@@ -33,7 +33,9 @@ class SuppliersController extends Controller
             $suppliers = $suppliers->TextSearch($request->input('search'));
         }
 
-        $offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0);
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($suppliers) && ($request->get('offset') > $suppliers->count())) ? $suppliers->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

app/Http/Controllers/Api/UsersController.php

@@ -13,6 +13,7 @@ use App\Models\Asset;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\LicensesTransformer;
 
 class UsersController extends Controller
 {
@@ -87,7 +88,10 @@ class UsersController extends Controller
         }
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0);
+
+        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
+        // case we override with the actual count, so we should return 0 items.
+        $offset = (($users) && ($request->get('offset') > $users->count())) ? $users->count() : $request->get('offset', 0);
 
         // Check to make sure the limit is not higher than the max allowed
         ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
@@ -228,7 +232,7 @@ class UsersController extends Controller
     public function show($id)
     {
         $this->authorize('view', User::class);
-        $user = User::findOrFail($id);
+        $user = User::withCount('assets as assets_count','licenses as licenses_count','accessories as accessories_count','consumables as consumables_count')->findOrFail($id);
         return (new UsersTransformer)->transformUser($user);
     }
 
@@ -355,6 +359,23 @@ class UsersController extends Controller
         return (new AccessoriesTransformer)->transformAccessories($accessories, $accessories->count());
     }
 
+    /**
+     * Return JSON containing a list of licenses assigned to a user.
+     *
+     * @author [N. Mathar] [<snipe@snipe.net>]
+     * @since [v5.0]
+     * @param $userId
+     * @return string JSON
+     */
+    public function licenses($id)
+    {
+        $this->authorize('view', User::class);
+        $this->authorize('view', License::class);
+        $user = User::where('id', $id)->withTrashed()->first();
+        $licenses = $user->licenses()->get();
+        return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
+    }
+
     /**
      * Reset the user's two-factor status
      *
@@ -393,6 +414,6 @@ class UsersController extends Controller
      */
     public function getCurrentUserInfo(Request $request)
     {
-        return response()->json($request->user());
+        return (new UsersTransformer)->transformUser($request->user());
     }
 }

app/Http/Controllers/AssetModelsController.php

@@ -90,23 +90,7 @@ class AssetModelsController extends Controller
             $model->fieldset_id = e($request->input('custom_fieldset'));
         }
 
-        if (Input::file('image')) {
-
-            $image = Input::file('image');
-            $file_name = str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-            $path = app('models_upload_path');
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save($path.'/'.$file_name);
-            } else {
-                $image->move($path, $file_name);
-            }
-            $model->image = $file_name;
-
-        }
+        $model = $request->handleImages($model,600, public_path().'/uploads/models');
 
             // Was it created?
         if ($model->save()) {
@@ -182,37 +166,7 @@ class AssetModelsController extends Controller
             }
         }
 
-        $old_image = $model->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $model->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $model->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('models_upload_path').$file_name);
-            } else {
-                $image->move(app('models_upload_path'), $file_name);
-            }
-            $model->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('models_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
-
+        $model = $request->handleImages($model,600, public_path().'/uploads/models');
 
         if ($model->save()) {
             return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success'));

app/Http/Controllers/AssetsController.php

@@ -326,7 +326,7 @@ class AssetsController extends Controller
                 unlink(public_path().'/uploads/assets/'.$asset->image);
                 $asset->image = '';
             } catch (\Exception $e) {
-                \Log::info($e);
+                \Log::debug($e);
             }
 
         }
@@ -394,6 +394,12 @@ class AssetsController extends Controller
 
 
         if ($asset->save()) {
+
+             // Update any assigned assets with the new location_id from the parent asset
+
+            Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $asset->id)
+                ->update(['location_id' => $asset->location_id]);
+
             // Redirect to the new asset page
             \Session::flash('success', trans('admin/hardware/message.update.success'));
             return response()->json(['redirect_url' => route("hardware.show", $assetId)]);
@@ -499,6 +505,7 @@ class AssetsController extends Controller
         $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';
 
         if (isset($asset->id, $asset->asset_tag)) {
+
             if (file_exists($barcode_file)) {
                 $header = ['Content-type' => 'image/png'];
                 return response()->file($barcode_file, $header);
@@ -507,10 +514,22 @@ class AssetsController extends Controller
                 $barcode_width = ($settings->labels_width - $settings->labels_display_sgutter) * 96.000000000001;
 
                 $barcode = new \Com\Tecnick\Barcode\Barcode();
-                $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50);
 
-                file_put_contents($barcode_file, $barcode_obj->getPngData());
-                return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+                try {
+
+                    $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50);
+
+                    file_put_contents($barcode_file, $barcode_obj->getPngData());
+                    return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+
+                } catch (\Exception $e) {
+                    \Log::debug('Error creating barcode: '.$e->getMessage());
+                    \Log::debug('This usually happens because the asset tags are of a format that is not compatible with the selected barcode type.');
+                    $img = file_get_contents(public_path().'/uploads/barcodes/invalid_barcode.gif');
+                    return response($img)->header('Content-type', 'image/gif');
+                }
+
+
             }
         }
     }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
 class ForgotPasswordController extends Controller
 {
@@ -41,6 +42,8 @@ class ForgotPasswordController extends Controller
         return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
     }
 
+
+
     /**
      * Send a reset link to the given user.
      *
@@ -49,11 +52,21 @@ class ForgotPasswordController extends Controller
      */
     public function sendResetLinkEmail(Request $request)
     {
-        $this->validate($request, ['email' => 'required|email']);
 
-        // We will send the password reset link to this user. Once we have attempted
-        // to send the link, we will examine the response then see the message we
-        // need to show to the user. Finally, we'll send out a proper response.
+        /**
+         * Let's set a max character count here to prevent potential
+         * buffer overflow issues with attackers sending very large
+         * payloads through.
+         */
+        $this->validate($request, ['email' => 'required|email|max:250']);
+
+        /**
+         * If we find a matching email with an activated user, we will
+         * send the password reset link to the user.
+         *
+         * Once we have attempted to send the link, we will examine the response
+         * then see the message we need to show to the user. Finally, we'll send out a proper response.
+         */
         $response = $this->broker()->sendResetLink(
             array_merge(
                 $request->only('email'),
@@ -65,9 +78,25 @@ class ForgotPasswordController extends Controller
             return redirect()->route('login')->with('status', trans($response));
         }
 
-        // If an error was returned by the password broker, we will get this message
-        // translated so we can notify a user of the problem. We'll redirect back
-        // to where the users came from so they can attempt this process again.
+
+        /**
+         * If an error was returned by the password broker, we will get this message
+         * translated so we can notify a user of the problem. We'll redirect back
+         * to where the users came from so they can attempt this process again.
+         *
+         * HOWEVER, we do not want to translate the message if the user isn't found
+         * or isn't active, since that would allow an attacker to walk through
+         * a dictionary attack and figure out registered user email addresses.
+         *
+         * Instead we tell the user we've sent an email even though we haven't.
+         * It's bad UX, but better security. The compromises we sometimes have to make.
+        */
+
+        if ($response == 'passwords.user') {
+            \Log::debug('User with email '.$request->input('email').' attempted a password reset request but was not found. No email was sent.');
+            return redirect()->route('login')->with('success', trans('passwords.user_inactive'));
+        }
+
         return back()->withErrors(
             ['email' => trans($response)]
         );

app/Http/Controllers/CategoriesController.php

@@ -83,17 +83,7 @@ class CategoriesController extends Controller
         $category->checkin_email        = $request->input('checkin_email', '0');
         $category->user_id              = Auth::id();
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/categories/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $category->image = $file_name;
-        }
-
+        $category = $request->handleImages($category,600, public_path().'/uploads/categories');
 
         if ($category->save()) {
             return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success'));
@@ -152,37 +142,12 @@ class CategoriesController extends Controller
         $category->require_acceptance   = $request->input('require_acceptance', '0');
         $category->checkin_email        = $request->input('checkin_email', '0');
 
-        $old_image = $category->image;
-
         // Set the model's image property to null if the image is being deleted
         if ($request->input('image_delete') == 1) {
             $category->image = null;
         }
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $category->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('categories_upload_path').$file_name);
-            } else {
-                $image->move(app('categories_upload_path'), $file_name);
-            }
-            $category->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('categories_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
-
+        $category = $request->handleImages($category,600, public_path().'/uploads/categories');
 
         if ($category->save()) {
             // Redirect to the new category page

app/Http/Controllers/CompaniesController.php

@@ -63,16 +63,7 @@ final class CompaniesController extends Controller
         $company = new Company;
         $company->name = $request->input('name');
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/companies/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $company->image = $file_name;
-        }
+        $company = $request->handleImages($company,600, public_path().'/uploads/companies');
 
         if ($company->save()) {
             return redirect()->route('companies.index')
@@ -121,36 +112,12 @@ final class CompaniesController extends Controller
 
         $company->name = $request->input('name');
 
-        $old_image = $company->image;
-
         // Set the model's image property to null if the image is being deleted
         if ($request->input('image_delete') == 1) {
             $company->image = null;
         }
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $company->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('companies_upload_path').$file_name);
-            } else {
-                $image->move(app('companies_upload_path'), $file_name);
-            }
-            $company->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('companies_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
+        $company = $request->handleImages($company,600, public_path().'/uploads/companies');
 
 
         if ($company->save()) {

app/Http/Controllers/ComponentsController.php

@@ -91,16 +91,7 @@ class ComponentsController extends Controller
         $component->user_id                = Auth::id();
 
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/components/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $component->image = $file_name;
-        }
+        $component = $request->handleImages($component,600, public_path().'/uploads/components');
 
         if ($component->save()) {
             return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
@@ -164,18 +155,7 @@ class ComponentsController extends Controller
         $component->purchase_cost          = request('purchase_cost');
         $component->qty                    = Input::get('qty');
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/components/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $component->image = $file_name;
-        } elseif ($request->input('image_delete')=='1') {
-            $component->image = null;
-        }
+        $component = $request->handleImages($component,600, public_path().'/uploads/components');
 
         if ($component->save()) {
             return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));

app/Http/Controllers/ConsumablesController.php

@@ -87,16 +87,8 @@ class ConsumablesController extends Controller
         $consumable->user_id                = Auth::id();
 
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/consumables/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $consumable->image = $file_name;
-        }
+        $consumable = $request->handleImages($consumable,600, public_path().'/uploads/components');
+
 
         if ($consumable->save()) {
             return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.create.success'));
@@ -212,7 +204,7 @@ class ConsumablesController extends Controller
         if (isset($consumable->id)) {
             return view('consumables/view', compact('consumable'));
         }
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist', compact('id')));
+        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
     }
 
     /**

app/Http/Controllers/DepartmentsController.php

@@ -53,16 +53,7 @@ class DepartmentsController extends Controller
         $department->user_id = Auth::user()->id;
         $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null);
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/departments/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $department->image = $file_name;
-        }
+        $department = $request->handleImages($department,600, public_path().'/uploads/departments');
 
         if ($department->save()) {
             return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success'));
@@ -164,36 +155,7 @@ class DepartmentsController extends Controller
         $department->fill($request->all());
         $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null);
 
-        $old_image = $department->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $department->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $department->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('departments_upload_path').$file_name);
-            } else {
-                $image->move(app('departments_upload_path'), $file_name);
-            }
-            $department->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('departments_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
+        $department = $request->handleImages($department,600, public_path().'/uploads/departments');
 
         if ($department->save()) {
             return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success'));

app/Http/Controllers/LocationsController.php

@@ -88,16 +88,7 @@ class LocationsController extends Controller
         $location->manager_id       = $request->input('manager_id');
         $location->user_id          = Auth::id();
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/locations/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $location->image = $file_name;
-        }
+        $location = $request->handleImages($location,600, public_path().'/uploads/locations');
 
         if ($location->save()) {
             return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success'));
@@ -162,37 +153,7 @@ class LocationsController extends Controller
         $location->zip          = $request->input('zip');
         $location->ldap_ou      = $request->input('ldap_ou');
         $location->manager_id   = $request->input('manager_id');
-
-        $old_image = $location->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $location->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $location->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('locations_upload_path').$file_name);
-            } else {
-                $image->move(app('locations_upload_path'), $file_name);
-            }
-            $location->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('locations_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
+        $location = $request->handleImages($location,600, public_path().'/uploads/locations');
 
 
         if ($location->save()) {

app/Http/Controllers/ManufacturersController.php

@@ -75,18 +75,7 @@ class ManufacturersController extends Controller
         $manufacturer->support_url     = $request->input('support_url');
         $manufacturer->support_phone    = $request->input('support_phone');
         $manufacturer->support_email    = $request->input('support_email');
-
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_slug($image->getClientOriginalName()).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/manufacturers/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $manufacturer->image = $file_name;
-        }
+        $manufacturer = $request->handleImages($manufacturer,600, public_path().'/uploads/manufacturers');
 
 
 
@@ -142,37 +131,14 @@ class ManufacturersController extends Controller
         $manufacturer->support_url     = $request->input('support_url');
         $manufacturer->support_phone    = $request->input('support_phone');
         $manufacturer->support_email    = $request->input('support_email');
-
-        $old_image = $manufacturer->image;
-
+        
         // Set the model's image property to null if the image is being deleted
         if ($request->input('image_delete') == 1) {
             $manufacturer->image = null;
         }
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $manufacturer->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
+        $manufacturer = $request->handleImages($manufacturer,600, public_path().'/uploads/manufacturers');
 
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('manufacturers_upload_path').$file_name);
-            } else {
-                $image->move(app('manufacturers_upload_path'), $file_name);
-            }
-            $manufacturer->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('manufacturers_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
 
 
         if ($manufacturer->save()) {

app/Http/Controllers/SettingsController.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
+use enshrined\svgSanitize\Sanitizer;
 use Input;
 use Lang;
 use Illuminate\Http\Request;
@@ -426,12 +427,23 @@ class SettingsController extends Controller
                 $file_name = "logo.".$image->getClientOriginalExtension();
                 $path = public_path('uploads');
                 if ($image->getClientOriginalExtension()!='svg') {
+
                     Image::make($image->getRealPath())->resize(null, 150, function ($constraint) {
                         $constraint->aspectRatio();
                         $constraint->upsize();
                     })->save($path.'/'.$file_name);
                 } else {
-                    $image->move($path, $file_name);
+
+                    // This is kinda copypasta from the ImageUploadRequest - should refactor the ImageUploadRequest to better handle maybe
+                    $sanitizer = new Sanitizer();
+                    $dirtySVG = file_get_contents($image->getRealPath());
+                    $cleanSVG = $sanitizer->sanitize($dirtySVG);
+
+                    try {
+                        file_put_contents($path.'/'.$file_name, $cleanSVG);
+                    } catch (\Exception $e) {
+                        \Log::debug($e);
+                    }
                 }
                 $setting->logo = $file_name;
             }

app/Http/Controllers/SuppliersController.php

@@ -78,17 +78,8 @@ class SuppliersController extends Controller
         $supplier->notes                = request('notes');
         $supplier->url                  = $supplier->addhttp(request('url'));
         $supplier->user_id              = Auth::id();
+        $supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers');
 
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = str_random(25).".".$image->getClientOriginalExtension();
-            $path = public_path('uploads/suppliers/'.$file_name);
-            Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-            $supplier->image = $file_name;
-        }
 
         if ($supplier->save()) {
             return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success'));
@@ -145,39 +136,7 @@ class SuppliersController extends Controller
         $supplier->email                = request('email');
         $supplier->url                  = $supplier->addhttp(request('url'));
         $supplier->notes                = request('notes');
-
-
-        $old_image = $supplier->image;
-
-        // Set the model's image property to null if the image is being deleted
-        if ($request->input('image_delete') == 1) {
-            $supplier->image = null;
-        }
-
-        if ($request->file('image')) {
-            $image = $request->file('image');
-            $file_name = $supplier->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
-
-            if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(800, null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                })->save(app('suppliers_upload_path').$file_name);
-            } else {
-                $image->move(app('suppliers_upload_path'), $file_name);
-            }
-            $supplier->image = $file_name;
-
-        }
-
-        if ((($request->file('image')) && (isset($old_image)) && ($old_image!='')) || ($request->input('image_delete') == 1)) {
-            try  {
-                unlink(app('suppliers_upload_path').$old_image);
-            } catch (\Exception $e) {
-                \Log::info($e);
-            }
-        }
-
+        $supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers');
 
         if ($supplier->save()) {
             return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success'));

app/Http/Requests/ImageUploadRequest.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Requests;
 
-use App\Http\Requests\Request;
+use App\Models\SnipeModel;
+use Intervention\Image\Facades\Image;
+use enshrined\svgSanitize\Sanitizer;
 
 class ImageUploadRequest extends Request
 {
@@ -33,4 +35,83 @@ class ImageUploadRequest extends Request
     {
         return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
     }
-}
+
+    /**
+     * Handle and store any images attached to request
+     * @param SnipeModel $item Item the image is associated with
+     * @param String $path  location for uploaded images, defaults to uploads/plural of item type.
+     * @return SnipeModel        Target asset is being checked out to.
+     */
+    public function handleImages($item, $w = 600, $path = null)
+    {
+
+        $type = strtolower(class_basename(get_class($item)));
+
+        if (is_null($path)) {
+            $path =  str_plural($type);
+        }
+
+        \Log::debug('Trying to upload to '. $path);
+
+        if ($this->hasFile('image')) {
+
+            if (!config('app.lock_passwords')) {
+
+
+                if (!is_dir($path)) {
+                    \Log::debug($path.' does not exist');
+                    mkdir($path);
+                }
+
+                $image = $this->file('image');
+                $ext = $image->getClientOriginalExtension();
+                $file_name = $type.'-'.str_random(18).'.'.$ext;
+                \Log::debug('File name will be: '.$file_name);
+
+                if ($image->getClientOriginalExtension()!=='svg') {
+                    \Log::debug('Not an SVG - resize');
+                    \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
+                    $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    \Log::debug('This is an SVG');
+                    $sanitizer = new Sanitizer();
+                    $dirtySVG = file_get_contents($image->getRealPath());
+                    $cleanSVG = $sanitizer->sanitize($dirtySVG);
+
+                    try {
+                        \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
+                        file_put_contents($path.'/'.$file_name, $cleanSVG);
+                    } catch (\Exception $e) {
+                        \Log::debug($e);
+                    }
+                }
+
+
+                // Remove Current image if exists
+                if (($item->image) && (file_exists($path.'/'.$item->image))) {
+                    try {
+                        unlink($path.'/'.$item->image);
+                    } catch (\Exception $e) {
+                        \Log::debug($e);
+                    }
+                }
+
+                $item->image = $file_name;
+            }
+
+        } elseif ($this->input('image_delete')=='1') {
+
+            try {
+                unlink($path.'/'.$item->image);
+            } catch (\Exception $e) {
+                \Log::debug($e);
+            }
+
+            $item->image = null;
+        }
+        return $item;
+    }
+}

app/Http/Transformers/ActionlogsTransformer.php

@@ -30,18 +30,49 @@ class ActionlogsTransformer
         // This is necessary since we can't escape special characters within a JSON object
         if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
             $meta_array = json_decode($actionlog->log_meta);
-            foreach ($meta_array as $key => $value) {
-                foreach ($value as $meta_key => $meta_value) {
 
-                    if (is_array($meta_value)) {
-                        foreach ($meta_value as $meta_value_key => $meta_value_value) {
-                            $clean_meta[$key][$meta_value_key] = e($meta_value_value);
+            if ($meta_array) {
+                foreach ($meta_array as $key => $value) {
+                    foreach ($value as $meta_key => $meta_value) {
+
+                        if (is_array($meta_value)) {
+                            foreach ($meta_value as $meta_value_key => $meta_value_value) {
+                                $clean_meta[$key][$meta_value_key] = e($meta_value_value);
+                            }
+                        } else {
+
+                            // This object stuff is weird, and is used to make up for the fact that
+                            // older data can get strangely formatted if an asset existed,
+                            // then a new custom field is added, and the asset is saved again.
+                            // It can result in funnily-formatted strings like:
+                            //
+                            // {"_snipeit_right_sized_fault_tolerant_localareanetwo_1":
+                            // {"old":null,"new":{"value":"1579490695972","_snipeit_new_field_2":2,"_snipeit_new_field_3":"Monday, 20 January 2020 2:24:55 PM"}}
+                            // so we have to walk down that next level
+
+                            if (is_object($meta_value)) {
+
+                                foreach ($meta_value as $meta_value_key => $meta_value_value) {
+
+                                    if ($meta_value_key == 'value') {
+                                        $clean_meta[$key]['old'] = null;
+                                        $clean_meta[$key]['new'] = e($meta_value->value);
+                                    } else {
+                                        $clean_meta[$meta_value_key]['old'] = null;
+                                        $clean_meta[$meta_value_key]['new'] = e($meta_value_value);
+                                    }
+                                }
+
+
+
+                            } else {
+                                $clean_meta[$key][$meta_key] = e($meta_value);
+                            }
                         }
-                    } else {
-                        $clean_meta[$key][$meta_key] = e($meta_value);
-                    }
 
+                    }
                 }
+
             }
         }
 

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -5,6 +5,7 @@ use App\Models\AssetMaintenance;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
 use App\Helpers\Helper;
+use App\Models\Asset;
 
 class AssetMaintenancesTransformer
 {

app/Http/Transformers/LicenseSeatsTransformer.php

@@ -29,7 +29,14 @@ class LicenseSeatsTransformer
             'name' => 'Seat '.$seat_count,
             'assigned_user' => ($seat->user) ? [
                 'id' => (int) $seat->user->id,
-                'name'=> e($seat->user->present()->fullName)
+                'name'=> e($seat->user->present()->fullName),
+                'department'=>
+                    ($seat->user->department) ?
+                        [
+                            "id" => (int) $seat->user->department->id,
+                            "name" => e($seat->user->department->name)
+
+                        ] : null
             ] : null,
             'assigned_asset' => ($seat->asset) ? [
                 'id' => (int) $seat->asset->id,

app/Importer/AssetImporter.php

@@ -76,6 +76,8 @@ class AssetImporter extends ItemImporter
         }
 
         $this->item['image'] = $this->findCsvMatch($row, "image");
+        $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));;
+        $asset->requestable =  $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));
         $this->item['warranty_months'] = intval($this->findCsvMatch($row, "warranty_months"));
         $this->item['model_id'] = $this->createOrFetchAssetModel($row);
 

app/Importer/Importer.php

@@ -443,11 +443,7 @@ abstract class Importer
 
     public function fetchHumanBoolean($value)
     {
-        if (($value =='1') || (strtolower($value) =='true') || (strtolower($value) =='yes'))
-        {
-            return '1';
-        }
-        return '0';
+       return (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
     }
 
     /**

app/Models/Asset.php

@@ -111,6 +111,7 @@ class Asset extends Depreciable
         'status_id',
         'supplier_id',
         'warranty_months',
+        'requestable',
     ];
 
     use Searchable;
@@ -604,20 +605,26 @@ class Asset extends Depreciable
 
     public function requireAcceptance()
     {
-        return $this->model->category->require_acceptance;
+        if (($this->model) && ($this->model->category)) {
+            return $this->model->category->require_acceptance;
+        }
+
     }
 
     public function getEula()
     {
         $Parsedown = new \Parsedown();
-
-        if ($this->model->category->eula_text) {
-            return $Parsedown->text(e($this->model->category->eula_text));
-        } elseif ($this->model->category->use_default_eula == '1') {
-            return $Parsedown->text(e(Setting::getSettings()->default_eula_text));
-        } else {
-            return false;
+        
+        if (($this->model) && ($this->model->category)) {
+            if ($this->model->category->eula_text) {
+                return $Parsedown->text(e($this->model->category->eula_text));
+            } elseif ($this->model->category->use_default_eula == '1') {
+                return $Parsedown->text(e(Setting::getSettings()->default_eula_text));
+            } else {
+                return false;
+            }
         }
+        return false;
     }
 
     /**
@@ -821,9 +828,11 @@ class Asset extends Depreciable
 
     public function scopeDueForAudit($query, $settings)
     {
+        $interval = $settings->audit_warning_days ?? 0;
+
         return $query->whereNotNull('assets.next_audit_date')
             ->where('assets.next_audit_date', '>=', Carbon::now())
-            ->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $settings->audit_warning_days DAY) <= '".Carbon::now()."'")
+            ->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $interval DAY) <= '".Carbon::now()."'")
             ->where('assets.archived', '=', 0)
             ->NotArchived();
     }
@@ -1389,8 +1398,7 @@ class Asset extends Depreciable
 
 
     /**
-     * Query builder scope to search on location ID
-     *
+     * Query builder scope to search on depreciation name
      * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
      * @param  text                              $search      Search term
      *

app/Models/LicenseSeat.php

@@ -55,4 +55,23 @@ class LicenseSeat extends Model implements ICompanyableChild
         return false;
 
     }
+
+    /**
+     * Query builder scope to order on department
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order         Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderDepartments($query, $order)
+    {
+        return $query->leftJoin('users as license_seat_users',  'license_seats.assigned_to', '=', 'license_seat_users.id')
+            ->leftJoin('departments as license_user_dept',  'license_user_dept.id', '=', 'license_seat_users.department_id')
+            ->orderBy('license_user_dept.name', $order);
+    }
+
+
+
+
 }

app/Models/Location.php

@@ -150,11 +150,13 @@ class Location extends SnipeModel
 
     public static function indenter($locations_with_children, $parent_id = null, $prefix = '') {
         $results = Array();
+
         
         if (!array_key_exists($parent_id, $locations_with_children)) {
             return [];
         }
 
+
         foreach ($locations_with_children[$parent_id] as $location) {
             $location->use_text = $prefix.' '.$location->name;
             $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null;

app/Models/Setting.php

@@ -23,7 +23,7 @@ class Setting extends Model
           'slack_endpoint'   => 'url|required_with:slack_channel|nullable',
           'slack_channel'   => 'regex:/(?<!\w)#\w+/|required_with:slack_endpoint|nullable',
           'slack_botname'   => 'string|nullable',
-          'labels_per_page' => 'numeric',
+          'labels_per_page' => 'numeric|min:1',
           'labels_width' => 'numeric',
           'labels_height' => 'numeric',
           'labels_pmargin_left' => 'numeric|nullable',

app/Presenters/AssetPresenter.php

@@ -258,13 +258,17 @@ class AssetPresenter extends Presenter
             $query->whereHas('models');
         })->get();
 
+
+        // Note: We do not need to e() escape the field names here, as they are already escaped when
+        // they are presented in the blade view. If we escape them here, custom fields with quotes in their
+        // name can break the listings page. - snipe
         foreach ($fields as $field) {
             $layout[] = [
                 "field" => 'custom_fields.'.$field->convertUnicodeDbSlug(),
                 "searchable" => true,
                 "sortable" => true,
                 "switchable" => true,
-                "title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.e($field->name) : e($field->name),
+                "title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.$field->name : $field->name,
                 "formatter" => "customFieldsFormatter"
             ];
 
@@ -391,7 +395,7 @@ class AssetPresenter extends Presenter
     public function eol_date()
     {
 
-        if (( $this->purchase_date ) && ( $this->model ) && ($this->model->model->eol) ) {
+        if (( $this->purchase_date ) && ( $this->model->model ) && ($this->model->model->eol) ) {
             $date = date_create($this->purchase_date);
             date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));
             return date_format($date, 'Y-m-d');

app/Presenters/LicensePresenter.php

@@ -176,6 +176,15 @@ class LicensePresenter extends Presenter
                 "visible" => true,
                 "formatter" => "usersLinkObjFormatter"
             ], [
+                "field" => "department",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.department'),
+                "visible" => false,
+                "formatter" => "departmentNameLinkFormatter"
+            ],
+            [
                 "field" => "assigned_asset",
                 "searchable" => false,
                 "sortable" => false,
@@ -191,7 +200,8 @@ class LicensePresenter extends Presenter
                 "title" => trans('general.location'),
                 "visible" => true,
                 "formatter" => "locationsLinkObjFormatter"
-            ], [
+            ],
+            [
                 "field" => "checkincheckout",
                 "searchable" => false,
                 "sortable" => false,

composer.json

@@ -14,6 +14,7 @@
     "doctrine/inflector": "^1.3",
     "doctrine/instantiator": "^1.2",
     "eduardokum/laravel-mail-auto-embed": "^1.0",
+    "enshrined/svg-sanitize": "^0.13.3",
     "erusev/parsedown": "^1.7",
     "fideloper/proxy": "^4.1",
     "guzzlehttp/guzzle": "^6.3",

config/database.php

@@ -87,12 +87,14 @@ return [
                 //'exclude_tables' => ['table1', 'table2'],
                 //'add_extra_option' => '--optionname=optionvalue',
             ],
-            'options' => (env('DB_SSL')) ? [
-                PDO::MYSQL_ATTR_SSL_KEY    => env('DB_SSL_KEY_PATH'),  // /path/to/key.pem
-                PDO::MYSQL_ATTR_SSL_CERT   => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem
-                PDO::MYSQL_ATTR_SSL_CA     => env('DB_SSL_CA_PATH'),   // /path/to/ca.pem
-                PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER')
-            ] : []
+            'options' => (env('DB_SSL')) ? ((env('DB_SSL_IS_PAAS')) ? [
+                PDO::MYSQL_ATTR_SSL_CA                  => env('DB_SSL_CA_PATH'),   // /path/to/ca.pem
+            ] : [
+                PDO::MYSQL_ATTR_SSL_KEY                 => env('DB_SSL_KEY_PATH'),  // /path/to/key.pem
+                PDO::MYSQL_ATTR_SSL_CERT                => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem
+                PDO::MYSQL_ATTR_SSL_CA                  => env('DB_SSL_CA_PATH'),   // /path/to/ca.pem
+                PDO::MYSQL_ATTR_SSL_CIPHER              => env('DB_SSL_CIPHER')
+            ]) : []
         ],
 
         'pgsql' => [

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.7.8',
-  'full_app_version' => 'v4.7.8 - build 4170-g4fe689dc5',
-  'build_version' => '4170',
+  'app_version' => 'v4.9.0',
+  'full_app_version' => 'v4.9.0 - build 4210-g8b2f8ef3c',
+  'build_version' => '4210',
   'prerelease_version' => '',
-  'hash_version' => 'g4fe689dc5',
-  'full_hash' => 'v4.7.8-7-g4fe689dc5',
+  'hash_version' => 'g8b2f8ef3c',
+  'full_hash' => 'v4.9.0-21-g8b2f8ef3c',
   'branch' => 'master',
-);
+);

resources/lang/cy/admin/accessories/general.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'about_accessories_title' 			=> 'Amdan Ategolion',
+    'about_accessories_text'  			=> 'Mae ategolion yn unrhyw offer sydd yn cael eu ddosbarthu i defnyddwyr ond ddim hefo rhif cofrestru. (Neu nid oes angen tracio). Er enghraifft, llygod, ategolion.',
+    'accessory_category' 				=> 'Categori Ategolyn',
+    'accessory_name'  					=> 'Enw Ategolyn',
+    'checkout'  							=> 'Cofnodi ategolyn allan',
+    'checkin'  							=> 'Cofnodi ategolyn i fewn',
+    'create'  							=> 'Creu Ategolyn',
+    'edit'  							=> 'Golygu Ategolyn',
+    'eula_text'							=> 'Categori CTDT',
+    'eula_text_help'					=> 'Mae\'r blwch yma yn caniatau i chi addasu eich CTDTs ar gyfer mathau penodol o asedau. Os ydych yn defnyddio un CTDT ar gyfer eich asedau yna cewch ticio\'r blwch isod i defnyddio\'r fersiwn diofyn.',
+    'require_acceptance'				=> 'Gorfodi defnyddwyr i cadarnhau derbyn asedau yn y categori yma.',
+    'no_default_eula'					=> 'Wedi methu darganfod CTDT, Ychwanegwch un yn gosodiadau.',
+    'total'  							=> 'Cyfanswm',
+    'remaining'  						=> 'Yn weddill',
+    'update'  							=> 'Diweddaru Ategolyn',
+    'use_default_eula'					=> 'Defnyddio\'r <a href="#" data-toggle="modal" data-target="#eulaModal">prif CTDT diofyn</a> yn lle.',
+    'use_default_eula_disabled'			=> '<del>Defnyddio\'r CTDT diofn yn lle\'r un presennol.</del>Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch un yn gosodiadau os gwelwch yn dda.',
+
+);

resources/lang/cy/admin/accessories/message.php

@@ -0,0 +1,37 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r ategolyn yn bodoli.',
+    'assoc_users'	 => 'Mae\'r ategolyn yma hefo :count eitem wedi nodi allan i defnyddwyr. Nodwch yr ategolion yn ol i fewn ac yna ceisiwch eto. ',
+
+    'create' => array(
+        'error'   => 'Ni crewyd yr ategolyn, ceisiwch eto o.g.y.dd.',
+        'success' => 'Ategolyn wedi creu yn llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd yr ategolyn, ceisiwch eto o.g.y.dd',
+        'success' => 'Diweddarwyd yr ategolyn yn llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n sicr eich bod eisiau dileu\'r eitem hwn?',
+        'error'   => 'Nid oedd yn bosib dileu\'r eitem. Ceisiwch eto o.g.y.dd.',
+        'success' => 'Ategolyn wedi dileu yn llwyddiannus.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Ategolyn heb ei nodi allan, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Ategolyn wedi nodi allan yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Nid oedd yn bosib nodi\'r ategolyn i fewn, ceisiwch eto o.g.y.dd',
+        'success' 		=> 'Ategolyn wedi nodi i fewn yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.'
+    )
+
+
+);

resources/lang/cy/admin/accessories/table.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Lawrlwytho CSV',
+	'eula_text'      			=> 'CTDT',
+    'id'      					=> 'Rhif Unigryw',
+    'require_acceptance'      	=> 'Derbyn',
+    'title'      				=> 'Enw Ategolyn',
+
+
+);

resources/lang/cy/admin/asset_maintenances/form.php

@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Manylion Cynnal a Chadw',
+        'title'                  => 'Teitl',
+        'start_date'             => 'Wedi cychwyn',
+        'completion_date'        => 'Wedi cwbwlhau',
+        'cost'                   => 'Cost',
+        'is_warranty'            => 'Gwelliant Gwarant',
+        'asset_maintenance_time' => 'Dyddiau',
+        'notes'                  => 'Nodiadau',
+        'update'                 => 'Diweddaru',
+        'create'                 => 'Creu'
+    ];

resources/lang/cy/admin/asset_maintenances/general.php

@@ -0,0 +1,11 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Cynnal a chadw Ased',
+        'edit'               => 'Golygu Cynnal a Chadw Ased',
+        'delete'             => 'Dileu Cynnal a Chadw Ased',
+        'view'               => 'Gweld manylder Cynnal a Chadw Ased',
+        'repair'             => 'Trwsio',
+        'maintenance'        => 'Cynnal a Chadw',
+        'upgrade'            => 'Uwchraddio'
+    ];

resources/lang/cy/admin/asset_maintenances/message.php

@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Ni ddarganfuwyd cofnod Cynnal a Chadw Ased yr oeddech yn edrych amdan!',
+        'delete'                       => [
+            'confirm' => 'Ydych chi\'n sicr eich bod eisiau dileu\'r cofnod cynnal a chadw yma?',
+            'error'   => 'Nid oedd yn bosib dileu\'r nodyn cynnal a chadw. Ceisiwch eto o.g.y.dd.',
+            'success' => 'Nodyn cynnal a chadw wedi\'i dileu\'n llwyddiannus.'
+        ],
+        'create'                       => [
+            'error'   => 'Ni crewyd y cofnod cynnal a chadw, ceisiwch eto o.g.y.dd.',
+            'success' => 'Nodyn cynnal a chadw wedi\'i greu\'n llwyddiannus.'
+        ],
+        'edit'                       => [
+            'error'   => 'Wedi methu newid y cofnod cynnal a chadw, ceisiwch eto o.g.y.dd.',
+            'success' => 'Nodyn cynnal a chadw wedi\'i diweddaru\'n llwyddiannus.'
+        ],
+        'asset_maintenance_incomplete' => 'Heb cwbwlhau eto',
+        'warranty'                     => 'Warant',
+        'not_warranty'                 => 'Dim Warant',
+    ];

resources/lang/cy/admin/asset_maintenances/table.php

@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Cynnal a chadw Ased',
+        'asset_name'    => 'Enw Ased',
+        'is_warranty'   => 'Warant',
+        'dl_csv'        => 'Lawrlwytho CSV'
+    ];

resources/lang/cy/admin/categories/general.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+    'about_categories_title' 			=> 'Amdan Categoriau',
+    'about_categories'  				=> 'Mae categoriau yn cynorthwyo chi i cadw trefn ar eich eitemau. Enghreifftiau o categoriau yw &quot;Cyfrifiadur pen-bwrdd&quot;, &quot;Gliniadur&quot;, &quot;Ffôn Symudol&quot;, &quot;Tabledi&quot;, ac yn y blaen, ond cewch gosod rhain yn ol eich angen.',
+    'asset_categories' 					=> 'Categoriau Asedau',
+    'category_name'  					=> 'Enw categori',
+    'checkin_email'                     => 'Gyrru ebost i defnyddiwr wrth nodi fewn/allan.',
+    'checkin_email_notification'        => 'Fe geith y defnyddiwr yma ebost wrth nodi i fewn/allan.',
+    'clone'                             => 'Dyblygu Categori',
+    'create'  							=> 'Creu Categori Newydd',
+    'edit'                              => 'Golygu Categori',
+    'eula_text'							=> 'CTDT Categori',
+    'eula_text_help'					=> 'Mae\'r blwch yma yn caniatau i chi addasu eich CTDTs ar gyfer mathau penodol o asedau. Os ydych yn defnyddio un CTDT ar gyfer eich asedau yna cewch ticio\'r blwch isod i defnyddio\'r fersiwn diofyn.',
+    'name'                              => 'Enw\'r categori',
+    'require_acceptance'				=> 'Gorfodi defnyddwyr i cadarnhau derbyn asedau yn y categori yma.',
+    'required_acceptance'				=> 'Fe geith y defnyddiwr yma ebost hefo linc i cofnodi derbyn yr eitem yma.',
+    'required_eula'						=> 'Fe geith y defnyddiwr yma copi o\'r CTDT trwy ebost',
+    'no_default_eula'					=> 'Wedi methu darganfod CTDT, Ychwanegwch un yn gosodiadau.',
+    'update'  							=> 'Diweddaru Categori',
+    'use_default_eula'					=> 'Defnyddio\'r <a href="#" data-toggle="modal" data-target="#eulaModal">prif CTDT diofyn</a> yn lle.',
+    'use_default_eula_disabled'			=> '<del>Defnyddio\'r CTDT diofyn yn lle\'r un presennol.</del>Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch yn ynj gosodiadau os gwelwch yn dda.',
+
+);

resources/lang/cy/admin/categories/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Categori ddim yn bodoli.',
+    'assoc_models'	 => 'Mae\'r categori yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y categori yma ac yna ceisiwch eto. ',
+    'assoc_items'	 => 'Mae\'r categori yma wedi perthnasu i :asset_type a nid yw\'n bosib dileu. Diweddarwch eich :asset_type i beidio cyfeirio at y categori yma ac yna ceisiwch eto. ',
+
+    'create' => array(
+        'error'   => 'Ni crewyd y categori, ceisiwch eto o. g. y. dd.',
+        'success' => 'Categori wedi creu\'n llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y categori, ceisiwch eto o. g. y. dd',
+        'success' => 'Categori wedi diweddaru\'n llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n siwr eich bod eisiau dileu\'r categori yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r categori. Ceisiwch eto o.g.y.dd.',
+        'success' => 'Categori wedi dileu\'n llwyddiannus.'
+    )
+
+);

resources/lang/cy/admin/categories/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'CTDT',
+    'id'      					=> 'Rhif Unigryw',
+    'parent'   					=> 'Rhiant',
+    'require_acceptance'      	=> 'Derbyn',
+    'title'      				=> 'Enw Categori Ased',
+
+);

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

@@ -0,0 +1,6 @@
+<?php
+return [
+    'about_companies_title'            => 'Amdan Cwmniau',
+    'about_companies_text'                  => 'Defnyddir cwmniau fel maes syml, neu i rheoli mynediad at grwpiau o offer, defnyddwyr os ydi cefnogaeth cwmniau wedi alluogi.',
+    'select_company' => 'Dewis Cwmni',
+];

resources/lang/cy/admin/companies/message.php

@@ -0,0 +1,18 @@
+<?php
+return array(
+    'does_not_exist' => 'Nid ywr cwmni\'n bodoli.',
+    'assoc_users'    => 'Mae\'r cwmni yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y cwmni yma ac yna ceisiwch eto. ',
+    'create' => array(
+        'error'   => 'Ni crewyd y cwmni, ceisiwch eto o. g. y. dd.',
+        'success' => 'Cwmni wedi creu yn llwyddiannus.'
+    ),
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y cwmni, ceisiwch eto o. g. y. dd',
+        'success' => 'Cwmni wedi diweddaru\'n llwyddiannus.'
+    ),
+    'delete' => array(
+        'confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r cwmni yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r cwmni. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Cwmni wedi dileu\'n llwyddiannus.'
+    )
+);

resources/lang/cy/admin/companies/table.php

@@ -0,0 +1,9 @@
+<?php
+return array(
+    'companies' => 'Cwmniau',
+    'create'    => 'Creu Cwmni',
+    'title'     => 'Cwmni',
+    'update'    => 'Diweddaru Cwmni',
+    'name'      => 'Enw Cwmni',
+    'id'        => 'Rhif Unigryw',
+);

resources/lang/cy/admin/components/general.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'about_components_title' 			=> 'Amdan Cydranau',
+    'about_components_text'  			=> 'Mae cydrannau yn darnau sydd yn rhan o ased, er enghraifft cof, disg caled, ayyb.',
+    'component_name'                  => 'Enw Cydran',
+    'checkin'                             => 'Nodi\'r gydran allan',
+    'checkout'                             => 'Nodi\'r gydran allan',
+    'cost'				=> 'Cost pwrcasu',
+    'create'                             => 'Creu Cydran',
+    'edit'                             => 'Addasu Cydran',
+    'date'					=> 'Dyddiad Pwrcasu',
+    'order'					=> 'Rhif Archeb',
+    'remaining' 			             => 'Yn weddill',
+    'total' 			                 => 'Cyfanswm',
+    'update'                            => 'Diweddaru Cydran',
+);

resources/lang/cy/admin/components/message.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid ywr cydran yn bodoli.',
+
+    'create' => array(
+        'error'   => 'Ni crewyd y cydran, ceisiwch eto o. g. y. dd.',
+        'success' => 'Cydran wedi creu yn llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni ddiweddarwyd y cydran, ceisiwch eto o. g. y. dd',
+        'success' => 'Diweddarwyd y gydran yn llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n siwr eich bod eisiau dileu\'r cydran yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r cydran. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Cydran wedi dileu\'n llwyddiannus.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Cydran heb ei nodi allan, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Cydran wedi nodi allan yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Cydran heb ei nodi i fewn, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Cydran wedi nodi i fewn yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+    )
+
+
+);

resources/lang/cy/admin/components/table.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Enw Cydran',
+);

resources/lang/cy/admin/consumables/general.php

@@ -0,0 +1,13 @@
+<?php
+
+return array(
+    'about_consumables_title' 			=> 'Amdan Nwyddau Traul',
+    'about_consumables_text'  			=> 'Mae unrhwy eitem sydd yn cael eu defnyddio i fyny dros amser yn nwydd traul. Er enghraifft, inc neu paper argraffydd.',
+    'checkout'                          => 'Nodi nwydd traul allan i defnyddiwr',
+    'consumable_name'                   => 'Enw nwydd traul',
+    'create'                            => 'Creu nwydd traul',
+    'item_no'                           => 'Rhif eitem.',
+    'remaining' 			            => 'Yn weddill',
+    'total' 			                => 'Cyfanswm',
+    'update'                            => 'Diweddaru nwydd traul',
+);

resources/lang/cy/admin/consumables/message.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r nwydd traul yn bodoli.',
+
+    'create' => array(
+        'error'   => 'Ni crewyd y nwydd traul, ceisiwch eto o. g. y. dd.',
+        'success' => 'Nwydd traul wedi creu yn llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y nwydd traul, ceisiwch eto o. g. y. dd',
+        'success' => 'Nwydd traul wedi diweddaru\'n llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n siwr eich bod eisiau dileu\'r nwydd traul yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r nwydd traul. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Nwydd traul wedi dileu\'n llwyddiannus.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Nwydd traul heb ei nodi allan, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Nwydd traul wedi nodi allan yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Nwydd traul heb ei nodi i fewn, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Nwydd traul wedi nodi i fewn yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.'
+    )
+
+
+);

resources/lang/cy/admin/consumables/table.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Enw nwydd traul',
+);

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

@@ -0,0 +1,32 @@
+<?php
+
+return array(
+    'custom_fields'		        => 'Meysydd addasedig',
+    'field'		                => 'Meysydd',
+    'about_fieldsets_title'		=> 'Amdan grwpiau meysydd',
+    'about_fieldsets_text'		=> 'Mae grwpiau meysydd yn caniatau i chi creu grwpiau o meysydd addasedig sydd yn cael ei defnyddio yn amal ar gyfer mathau penodol o asedau.',
+    'custom_format'             => 'Fformat Regex addasedig...',
+    'encrypt_field'      	        => 'Hamcryptio gwerth y maes yma yn y basdata',
+    'encrypt_field_help'      => 'RHYBUDD: Mae hamcryptio maes yn feddwl nid oes modd chwilio amdano.',
+    'encrypted'      	        => 'Wedi hamcryptio',
+    'fieldset'      	        => 'Setiau maes',
+    'qty_fields'      	      => 'Nifer o meysydd',
+    'fieldsets'      	        => 'Setiau maes',
+    'fieldset_name'           => 'Enw set maes',
+    'field_name'              => 'Enw maes',
+    'field_values'            => 'Gwerthoedd maes',
+    'field_values_help'       => 'Ychwanegwch opsiynau selectable, un fesul llinell. Anwybyddir llinellau gwag heblaw\'r llinell gyntaf.',
+    'field_element'           => 'Ffurf Elfen',
+    'field_element_short'     => 'Elfen',
+    'field_format'            => 'Fformat',
+    'field_custom_format'     => 'Fformat Regex addasedig',
+    'field_custom_format_help'     => 'Mae\'r maes hwn yn caniatáu ichi ddefnyddio mynegiad regex i\'w ddilysu. Dylai ddechrau gyda "regex:" - er enghraifft, i ddilysu bod gwerth maes arferiad yn cynnwys IMEI dilys (15 digid rhifol), byddech chi\'n defnyddio <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Gofynnol',
+    'req'   		              => 'Angen.',
+    'used_by_models'   		    => 'Defnyddir gan modelau',
+    'order'   		            => 'Trefn',
+    'create_fieldset'         => 'Set maes newydd',
+    'create_field'            => 'Maes Addasedig newydd',
+    'value_encrypted'      	        => 'Mae gwerth y maes hwn wedi\'i amgryptio yn y gronfa ddata. Dim ond defnyddwyr gweinyddol fydd yn gallu gweld y gwerth wedi\'i ddadgryptio',
+    'show_in_email'     => 'Cynnwys gwerth y maes hwn mewn e-byst talu a anfonir at y defnyddiwr? Ni ellir cynnwys meysydd wedi\'u hamgryptio mewn e-byst.',
+);

resources/lang/cy/admin/custom_fields/message.php

@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'Nid yw\'r maes yn bodoli.',
+        'already_added'   => 'Maes eisoes yn bodoli',
+
+        'create' => array(
+            'error'   => 'Ni crewyd y maes, ceisiwch eto o. g. y. dd.',
+            'success' => 'Maes wedi creu yn llwyddiannus.',
+            'assoc_success' => 'Maes wedi ychwanegu\'n llwyddiannus ir set maes.'
+        ),
+
+        'update' => array(
+            'error'   => 'Ni diweddarwyd y maes, ceisiwch eto o. g. y. dd',
+            'success' => 'Maes wedi diweddaru\'n llwyddiannus.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Ydych chi\'n siwr eich bod eisiau dileu\'r maes yma?',
+            'error'   => 'Nid oedd yn bosib dileu\'r maes. Ceisiwch eto o. g. y. dd.',
+            'success' => 'Maes wedi dileu\'n llwyddiannus.',
+            'in_use'   => 'Maes mewn defnydd.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Nid yw\'r set maes yn bodoli',
+
+        'create' => array(
+            'error'   => 'Ni crewyd y set maes, ceisiwch eto o. g. y. dd.',
+            'success' => 'Set maes wedi creu yn llwyddiannus.'
+        ),
+
+        'update' => array(
+            'error'   => 'Ni diweddarwyd y set maes, ceisiwch eto o. g. y. dd',
+            'success' => 'Set maes wedi diweddaru\'n llwyddiannus.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Ydych chi\'n siwr eich bod eisiau dileu\'r set maes yma?',
+            'error'   => 'Nid oedd yn bosib dileu\'r set maes. Ceisiwch eto o. g. y. dd.',
+            'success' => 'Set maes wedi dileu\'n llwyddiannus.',
+            'in_use'   => 'Set maes mewn defnydd.',
+        )
+
+    ),
+
+
+
+
+
+
+);

resources/lang/cy/admin/departments/message.php

@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r adran yn bodoli.',
+    'assoc_users'	 => 'Mae\'r adran yma wedi perthnasu i oleiaf un defnyddiwr a nid yw\'n bosib dileu. Diweddarwch eich defnyddwyr i beidio cyfeirio at yr adran yma ac yna ceisiwch eto. ',
+    'create' => array(
+        'error'   => 'Ni crewyd yr adran, ceisiwch eto o. g. y. dd.',
+        'success' => 'Adran wedi creu yn llwyddiannus.'
+    ),
+    'update' => array(
+        'error'   => 'Ni diweddarwyd yr adran, ceisiwch eto o. g. y. dd',
+        'success' => 'Adran wedi diweddaru\'n llwyddiannus.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Ydych chi\'n sicr eich bod eisiau dileu\'r adran yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r adran. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Adran wedi dileu\'n llwyddiannus.'
+    )
+
+);

resources/lang/cy/admin/departments/table.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'Rhif Unigryw',
+    'name'                      => 'Enw Adran',
+    'manager'                   => 'Rheolwr',
+    'location'                  => 'Lleoliad',
+    'create'                    => 'Creu Adran',
+    'update'                    => 'Diweddaru Adran',
+    );

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

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'about_asset_depreciations'  			=> 'Amdan Dibrisiant Asedau',
+    'about_depreciations'  					=> 'Cewch creu mathau o dibrisiant i dibrisio asedau yn seiliedig ar dibrisiant llinell syth.',
+    'asset_depreciations'  					=> 'Dibrisiant Asedau',
+    'create'  					            => 'Creu Dibrisiant',
+    'depreciation_name'  					=> 'Enw Dibrisiant',
+    'number_of_months'  					=> 'Nifer o Fisoedd',
+    'update'  					            => 'Diweddaru Dibrisiant',
+
+);

resources/lang/cy/admin/depreciations/message.php

@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r dosbarth yma o dibrsiant yn bodoli.',
+    'assoc_users'	 => 'Mae\'r dibrisiantyma wedi perthnasu hefo un neu mwy o modelau a nid oes modd i\'w dileu. Fydd rhaid dileu\'r modelau ac yna trio eto. ',
+
+
+    'create' => array(
+        'error'   => 'Ni crewyd y dosbarth dibrisiant, ceisiwch eto o. g. y. dd. :(',
+        'success' => 'Dosbarth dibrisiant wedi\'i creu yn llwyddiannus. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y dosbarth dibrisiant, ceisiwch eto o. g. y. dd',
+        'success' => 'Dosbarth dibrisiant wedi\'i diweddaru yn llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n siwr eich bod eisiau dileu\'r dosbarth dibrisiant yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r dosbarth dibrisiant. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Dosbarth dibrisiant wedi\'i dileu yn llwyddiannus.'
+    )
+
+);

resources/lang/cy/admin/depreciations/table.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+    'id'      => 'Rhif Unigryw',
+    'months'   => 'Misoedd',
+    'term'   => 'Cyfnod',
+    'title'      => 'Enw ',
+
+);

resources/lang/cy/admin/groups/message.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Grwp yn bodoli yn barod!',
+    'group_not_found'     => 'Nid yw grwp [:id] yn bodoli.',
+    'group_name_required' => 'Mae angen llenwi\'r maes enw',
+
+    'success' => array(
+        'create' => 'Wedi llwyddo i creu\'r grwp.',
+        'update' => 'Wedi llwyddo i diweddaru\'r grwp.',
+        'delete' => 'Wedi llwyddo i dileu\'r grwp.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n sicr eich bod eisiau dileu\'r grwp yma?',
+        'create' => 'Roedd problem wrth ceisio creu\'r grwp. Ceisiwch eto o. g. y. dd.',
+        'update' => 'Roedd problem wrth ceisio diweddaru\'r grwp. Ceisiwch eto o. g. y. dd.',
+        'delete' => 'Roedd problem wrth ceisio dileu\'r grwp. Ceisiwch eto o. g. y. dd.',
+    ),
+
+);

resources/lang/cy/admin/groups/table.php

@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Rhif Unigryw',
+    'name'       => 'Enw',
+    'users'      => '# o defnyddwyr',
+
+);

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

@@ -0,0 +1,14 @@
+<?php
+
+return array(
+    'about_groups_title'            => 'Amdan Grwpiau',
+    'about_groups'                  => 'Defnyddir grwpiau i gosod hawliau defnyddwyr.',
+    'group_management' 	 	=> 'Rheoli Grwpiau',
+    'create' 	 	 	    => 'Creu Grwp Newydd',
+    'update' 	 		        => 'Addasu Grwp',
+    'group_name' 	 		=> 'Enw Grwp',
+    'group_admin' 	 		=> 'Gweinyddwr Grwp',
+    'allow' 	 			=> 'Caniatau',
+    'deny' 	 				=> 'Gwrthod',
+
+);

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

@@ -0,0 +1,44 @@
+<?php
+
+return array(
+	'bulk_delete'		=> 'Cadarnahu Dileu Nifer o Asedau',
+  'bulk_delete_help'	=> 'Adolygwch yr asedau ar gyfer dileu isod. Ar ôl eu dileu, gellir adfer yr asedau hyn, ond ni fyddant yn gysylltiedig mwyach ag unrhyw ddefnyddwyr y maent wedi\'u neilltuo iddynt ar hyn o bryd.',
+  'bulk_delete_warn'	=> 'Rydych am dileu :asset_count assets.',
+	'bulk_update'		=> 'Diweddaru Nifer o Asedau',
+	'bulk_update_help'	=> 'Mae\'r ffurflen hon yn caniatáu ichi ddiweddaru nifer o asedau ar unwaith. Llenwch y meysydd sydd angen i chi eu newid yn unig. Bydd unrhyw bwlch a adewir yn wag yn aros yr un fath. ',
+	'bulk_update_warn'	=> 'Rydych am newid manylder am :asset_count o asedau.',
+    'checkedout_to'		=> 'Wedi aseinio i',
+    'checkout_date'		=> 'Dyddiad allan',
+    'checkin_date'		=> 'Dyddian i mewn',
+    'checkout_to'		=> 'Dynodi i',
+    'cost'				=> 'Cost pwrcasu',
+    'create'			=> 'Creu Ased',
+    'date'				=> 'Dyddiad Pwrcasu',
+    'depreciation'	    => 'Dibrisiant',
+    'depreciates_on'	=> 'Dibrisio Ar',
+    'default_location'	=> 'Lleoliad diofyn',
+    'eol_date'			=> 'Dyddiad DB',
+    'eol_rate'			=> 'Cyfradd DB',
+    'expected_checkin'  => 'Dyddiad disgwl i mewn',
+    'expires'			=> 'Dod i ben',
+    'fully_depreciated'	=> 'Dibrisiant Llwyr',
+    'help_checkout'		=> 'Os ydych chi am aseinio\'r ased hwn ar unwaith, dewiswch "Barod i\'w Ddefnyddio" o\'r rhestr statws uchod. ',
+    'mac_address'		=> 'Cyfeiriad MAC',
+    'manufacturer'		=> 'Gwneuthyrwr',
+    'model'				=> 'Model',
+    'months'			=> 'misoedd',
+    'name'				=> 'Enw Ased',
+    'notes'				=> 'Nodiadau',
+    'order'				=> 'Rhif Archeb',
+    'qr'				=> 'Côd QR',
+    'requestable'		=> 'Gellir ddefnyddwyr gwneud cais am yr ased yma',
+    'select_statustype'	=> 'Dewis Math o Statws',
+    'serial'			=> 'Serial',
+    'status'			=> 'Statws',
+    'tag'				=> 'Tag Ased',
+    'update'			=> 'Diweddaru Ased',
+    'warranty'			=> 'Warant',
+		'warranty_expires'		=> 'Warrant yn dod I ben',
+    'years'				=> 'blynyddoedd',
+)
+;

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

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'about_assets_title'           => 'Amdan Asedau',
+    'about_assets_text'            => 'Mae asedau wedi tracio trwy rhif cofrestru neu rhif ased. Maen yn tueddu fod yn eitemau gwerthfawr lle mae adnabod offer penodol yn bwysig.',
+	'archived'  				=> 'Archifwyd',
+    'asset'  					=> 'Ased',
+    'bulk_checkout'             => 'Nodi Asedau Allan',
+    'checkin'  					=> 'Nodi Asedau I Mewn',
+    'checkout'  				=> 'Nodi Asedau Allan',
+    'clone'  					=> 'Dyblygu Ased',
+    'deployable'  				=> 'Gellir ei ddefnyddio',
+    'deleted'  					=> 'Mae\'r ased yma wedi dileu. <a href="/hardware/:asset_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'edit'  					=> 'Addasu Ased',
+    'model_deleted'  			=> 'Mae\'r model yma o ased wedi\'i dileu. Rhaid i chi adfer y model cyn fedrwch chi adfer y\'r ased. <br/> <a href="/hardware/models/:model_id/restore">Cliciwch yma i adfer yr ased</a>.',
+    'requestable'               => 'Ar gael',
+    'requested'				    => 'Gofynnwyd amdano',
+    'restore'  					=> 'Adfer Ased',
+    'pending'  					=> 'Yn disgwl',
+    'undeployable'  			=> 'Dim ar gael',
+    'view'  					=> 'Gweld Ased',
+);

resources/lang/cy/admin/hardware/message.php

@@ -0,0 +1,83 @@
+<?php
+
+return array(
+
+    'undeployable' 		=> '<strong> Rhybudd: </strong> Mae\'r ased hwn wedi\'i nodi fel un na ellir ei ddefnyddio ar hyn o bryd.
+                        Os yw\'r statws hwn wedi newid, diweddarwch statws yr ased.',
+    'does_not_exist' 	=> 'Nid yw\'r ased yn bodoli.',
+    'does_not_exist_or_not_requestable' => 'Ymdrech da. Nid yw\'r ased yma yn bodoli neu ar gael.',
+    'assoc_users'	 	=> 'Ar hyn o bryd mae\'r ased yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr ased yn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ',
+
+    'create' => array(
+        'error'   		=> 'Ni crewyd yr ased, ceisiwch eto o. g. y. dd. :(',
+        'success' 		=> 'Ased wedi creu yn llwyddiannus. :)'
+    ),
+
+    'update' => array(
+        'error'   			=> 'Ni diweddarwyd yr assed, ceisiwch eto o. g. y. dd',
+        'success' 			=> 'Ased wedi diweddaru\'n llwyddiannus.',
+        'nothing_updated'	=>  'Dim newid mewn manylder, felly dim byd wedi\'i diweddaru.',
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Nid oedd yn bosib adfer yr ased, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Ased wedi adfer yn llwyddiannus.'
+    ),
+
+    'audit' => array(
+        'error'   		=> 'Roedd archwiliad asedau yn aflwyddiannus. Ceisiwch eto o. g. y. dd.',
+        'success' 		=> 'Cofnodwyd archwiliad asedau yn llwyddiannus.'
+    ),
+
+
+    'deletefile' => array(
+        'error'   => 'Ffeil heb ei ddileu. Ceisiwch eto o.g.y.dd.',
+        'success' => 'Ffeil wedi dileu yn llwyddiannus.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Ffeil(iau) heb ei uwchlwytho. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Ffeil(iau) wedi uwchlwytho yn llwyddiannus.',
+        'nofiles' => 'Ni wnaethoch chi ddewis unrhyw ffeiliau i\'w uwchlwytho, neu mae\'r ffeil rydych chi\'n ceisio ei huwchlwytho yn rhy fawr',
+        'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.',
+    ),
+
+    'import' => array(
+        'error'                 => 'Rhai eitemau heb ei mewnforio\'n gywir.',
+        'errorDetail'           => 'Ni fewnforiwyd yr eitemau canlynol oherwydd gwallau.',
+        'success'               => "Mae'ch ffeil wedi'i mewnforio",
+        'file_delete_success'   => "Mae eich ffeil wedi'i dileu yn llwyddiannus",
+        'file_delete_error'      => "Nid oedd yn bosib dileu'r ffeil",
+    ),
+
+
+    'delete' => array(
+        'confirm'   	=> 'Ydych chi\'n sicr eich bod eisiau dileu\'r ased yma?',
+        'error'   		=> 'Roedd problem wrth ceisio dileu\'r ased. Ceisiwch eto o. g. y. dd.',
+        'nothing_updated'   => 'Dim asedau wedi dewis, felly dim byd wedi\'i dileu.',
+        'success' 		=> 'Ased wedi dileu\'n llwyddiannus.'
+    ),
+
+    'checkout' => array(
+        'error'   		=> 'Ased heb ei nodi fel allan, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Ased wedi nodi fel allan yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.',
+        'not_available' => 'Nid yw\'r ased yma ar gael i\'w defnyddio!',
+        'no_assets_selected' => 'Rhaid i chi ddewis o leiaf un ased o\'r rhestr'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Ased heb ei nodi i mewn, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Ased wedi nodi i mewn yn llwyddiannus.',
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o. g. y. dd.',
+        'already_checked_in'  => 'Ased wedi nodi i mewn yn gywir.',
+
+    ),
+
+    'requests' => array(
+        'error'   		=> 'Nid oedd cais am yr ased, ceisiwch eto o. g. y. dd',
+        'success' 		=> 'Cais am ased yn llwyddiannus.',
+        'canceled'      => 'Wedi llwydo i canslo cais am ased'
+    )
+
+);

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

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'asset_tag'   	=> 'Rhif Ased (tag)',
+    'asset_model'       => 'Model',
+    'book_value'  	=> 'Gwerth',
+    'change' 		=> 'Mewn/Allan',
+    'checkout_date' => 'Dyddiad Allan',
+    'checkoutto' 	=> 'Allan',
+    'diff' 			=> 'Gwahaniaeth',
+    'dl_csv' 		=> 'Lawrlwytho CSV',
+    'eol' 			=> 'DB',
+    'id'      		=> 'Rhif Unigryw',
+    'location' 		=> 'Lleoliad',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Dyddiad Pwrcasu',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Statws',
+    'title'      	=> 'Ased ',
+    'image'		=> 'Delwedd Dyfais',
+    'days_without_acceptance' => 'Diwrnodau Heb Derbyn'
+
+);

resources/lang/cy/admin/licenses/form.php

@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Ased',
+    'checkin'           => 'Nodi i mewn',
+    'create'            => 'Creu Trwydded',
+    'expiration'        => 'Dyddiad Terfynu',
+    'license_key'       => 'Goriad',
+    'maintained'        => 'Cynnal a chadw',
+    'name'              => 'Enw Meddalwedd',
+    'no_depreciation'   => 'Peidio dibrisio',
+    'purchase_order'    => 'Rhif Archeb',
+    'reassignable'      => 'Posib ail dynodi',
+    'remaining_seats'   => 'Seddi yn weddill',
+    'seats'             => 'Seddi',
+    'termination_date'  => 'Dyddiad Terfynu',
+    'to_email'          => 'Ebost wedi trwyddedu',
+    'to_name'           => 'Enw wedi trwyddedu',
+    'update'            => 'Diweddaru Trwydded',
+    'checkout_help'     => 'Fedrwch nodi trwydded allan yn erbyn ased neu person. Fedrwch dewis y ddau ond rhaid i\'r person cydfynd hefo perchenog yr ased.'
+);

resources/lang/cy/admin/licenses/general.php

@@ -0,0 +1,21 @@
+<?php
+
+return array(
+    'about_licenses_title'            => 'Amdan trwyddedau',
+    'about_licenses'                  => 'Mae trwyddedau yn tracio feddalwedd. May yna nifer o seddi fedrwch nodi yn erbyn unigolion',
+    'checkin'  					=> 'Nodi sedd trwydded i fewn',
+    'checkout_history'  		=> 'Hanes nodi allan',
+    'checkout'  				=> 'Nodi sedd trwydded allan',
+    'edit'  					=> 'Golygu Trwydded',
+    'filetype_info'				=> 'Math o ffeiliau a caniateir yw png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, a rar.',
+    'clone'  					=> 'Dyblygu Trwydded',
+    'history_for'  				=> 'Hanes ar gyfer ',
+    'in_out'  					=> 'Mewn/Allan',
+    'info'  					=> 'Gwybodaeth Trwydded',
+    'license_seats'  			=> 'Seddi Trwydded',
+    'seat'  					=> 'Sedd',
+    'seats'  					=> 'Seddi',
+    'software_licenses'  		=> 'Trwyddedau Meddalwedd',
+    'user'  					=> 'Defnyddiwr',
+    'view'  					=> 'Gweld Trwydded',
+);

resources/lang/cy/admin/licenses/message.php

@@ -0,0 +1,51 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r trwydded yn bodoli.',
+    'user_does_not_exist' => 'Nid yw\'r defnyddiwr yn bodoli.',
+    'asset_does_not_exist' 	=> 'Nid yw\'r ased rydych yn ceisio perthnasu i\'r trwydded yma yn bodoli.',
+    'owner_doesnt_match_asset' => 'Nid y defnyddiwr sydd wedi nodi yw perchenog yr ased rydych yn ceisio perthnasu ir trwydded yma.',
+    'assoc_users'	 => 'Ar hyn o bryd mae\'r trwydded yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr trwyddedyn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ',
+    'select_asset_or_person' => 'Rhaid i chi ddewis ased neu defnyddiwr ond nid y ddau.',
+
+
+    'create' => array(
+        'error'   => 'Ni crewyd y trwydded, ceisiwch eto o. g. y. dd.',
+        'success' => 'Trwydded wedi creu yn llwyddiannus.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'Ffeil heb ei ddileu. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Ffeil wedi dileu yn llwyddiannus.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Ffeil(iau) heb ei uwchlwytho. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Ffeil(iau) wedi uwchlwytho yn llwyddiannus.',
+        'nofiles' => 'Ni wnaethoch chi ddewis unrhyw ffeiliau i\'w uwchlwytho, neu mae\'r ffeil rydych chi\'n ceisio ei huwchlwytho yn rhy fawr',
+        'invalidfiles' => 'Mae un neu mwy o\'r ffeiliau unai yn rhy fawr neu ddim y math cywir. Derbynir png, gif, fjp, doc, docx, pdf a txt.',
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y trwydded, ceisiwch eto o. g. y. dd',
+        'success' => 'Trwydded wedi diweddaru\'n llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n siwr eich bod eisiau dileu\'r trwydded yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r trwydded. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Trwydded wedi dileu yn llwyddiannus.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'Nid oedd yn bosib nodi\'r trwydded allan. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Trwydded wedi nodi allan yn llwyddiannus'
+    ),
+
+    'checkin' => array(
+        'error'   => 'Nid oedd yn bosib nodi\'r trwydded i mewn. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Trwydded wedi nodi i fewn yn llwyddiannus'
+    ),
+
+);

resources/lang/cy/admin/licenses/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Wedi Neilltuo i',
+    'checkout'   		=> 'Mewn/Allan',
+    'id'      			=> 'Rhif Unigryw',
+    'license_email'   	=> 'Ebost wedi trwyddedu',
+    'license_name'   	=> 'Wedi Trwyddedi',
+    'purchase_date'   	=> 'Dyddiad Pwrcasu',
+    'purchased'   		=> 'Prynwyd',
+    'seats'   			=> 'Seddi',
+    'hardware'   		=> 'Caledwedd',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'Trwydded',
+
+);

resources/lang/cy/admin/locations/message.php

@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r lleoliad yn bodoli.',
+    'assoc_users'	 => 'Mae\'r lleoliad yma wedi perthnasu i oleiaf un defnyddiwr a nid yw\'n bosib dileu. Diweddarwch eich defnyddwyr i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ',
+    'assoc_assets'	 => 'Mae\'r lleoliad yma wedi perthnasu i oleiaf un ased a nid yw\'n bosib dileu. Diweddarwch eich asedau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ',
+    'assoc_child_loc'	 => 'Mae\'r lleoliad yma yn rhiant i oleiaf un lleoliad a nid yw\'n bosib dileu. Diweddarwch eich lleoliadau i beidio cyfeirio at y lleoliad yma ac yna ceisiwch eto. ',
+
+
+    'create' => array(
+        'error'   => 'Ni crewyd y lleoliad, ceisiwch eto o.g.y.dd.',
+        'success' => 'Lleoliad wedi creu yn llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y lleoliad, ceisiwch eto o.g.y.dd',
+        'success' => 'Lleoliad wedi diweddaru\'n llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Ydych chi\'n siwr eich bod eisiau dileu\'r lleoliad yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r lleoliad. Ceisiwch eto o.g.y.dd.',
+        'success' => 'Lleoliad wedi dileu\'n llwyddiannus.'
+    )
+
+);

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

@@ -0,0 +1,21 @@
+<?php
+
+return array(
+    'about_locations_title'     => 'Amdan Lleoliadau',
+    'about_locations'           => 'Defnyddir lleoliadau i cofnodi manylder lleoliad ar gyfer defnyddwyr, asedau a eitemau eraill',
+    'assets_rtd'                => 'Asedau', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Asedau Wedi clustnodi',
+    'id'                        => 'Rhif Unigryw',
+    'city'                      => 'Dinas',
+    'state'                     => 'Talaith',
+    'country'                   => 'Gwlad',
+    'create'                    => 'Creu Lleoliad',
+    'update'                    => 'Diweddaru Lleoliad',
+    'name'                      => 'Enw Lleoliad',
+    'address'                   => 'Cyfeiriad',
+    'zip'                       => 'Côd Post',
+    'locations'                 => 'Lleoliadau',
+    'parent'                    => 'Rhiant',
+    'currency'                  => 'Arian y Lleoliad',
+    'ldap_ou'                   => 'OU a denyddir wrth chwilio LDAP',
+    );

resources/lang/cy/admin/manufacturers/message.php

@@ -0,0 +1,29 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r gwneuthyrwr yn bodoli.',
+    'assoc_users'	 => 'Mae\'r gwneuthyrwr yma wedi perthnasu i oleiaf un model a nid yw\'n bosib dileu. Diweddarwch eich modelau i beidio cyfeirio at y gwneuthyrwr yma ac yna ceisiwch eto. ',
+
+    'create' => array(
+        'error'   => 'Ni crewyd ygwneuthyrwr, ceisiwch eto o. g. y. dd.',
+        'success' => 'Gwneuthyrwr wedi creu yn llwyddiannus.'
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y gwneuthyrwr, ceisiwch eto o. g. y. dd',
+        'success' => 'Gwneuthyrwr wedi diweddaru yn llwyddiannus.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Nid oedd yn bosib adfer y gwneuthyrwr, ceisiwch eto o. g. y. dd',
+        'success' => 'Gwneuthyrwr wedi adfer yn llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n sicr eich bod eisiau dileu\'r gwneuthyrwr yma?',
+        'error'   => 'Roedd problem wrth ceisio dileu\'r gwneuthyrwr. Ceisiwch eto o. g. y. dd.',
+        'success' => 'Gwneuthyrwr wedi dileu\'n llwyddiannus.'
+    )
+
+);

resources/lang/cy/admin/manufacturers/table.php

@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'Amdan Gwneuthyrwyr',
+    'about_manufacturers_text'  => 'Gwneuthurwyr yw\'r cwmnïau sy\'n creu eich asedau. Gallwch ddod o hyd i wybodaeth bwysig amdanynt yma, a fydd yn cael ei harddangos ar eich tudalennau manylion asedau.',
+    'asset_manufacturers'	=> 'Gwneuthyrwyr Asedau',
+    'create'				=> 'Creu Gwneuthyrwr',
+    'id'   					=> 'Rhif Unigryw',
+    'name'      			=> 'Enw',
+    'support_email'   		=> 'Ebost Cefnogaeth',
+    'support_phone'   		=> 'Rhif ffôn cefnogaeth',
+    'support_url'   		=> 'Wefan cefnogaeth',
+    'update'				=> 'Diweddaru Gwneuthyrwr',
+    'url'   				=> 'URL',
+
+);

resources/lang/cy/admin/models/general.php

@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'Amdan Modelau',
+    'about_models_text'           => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.',
+    'deleted'  					        => 'Mae\'r model yma wedi dileu. <a href="/hardware/models/:model_id/restore">Cliciwch yma i\'w adfer</a>.',
+    'bulk_delete'               => 'Dileu Nifer o Modelau',
+    'bulk_delete_help'               => 'Rhowch tic yn y bocsys isod i cadarnhau dileu y model. Nid oes modd dileu modelau sydd hefo asedau yn ei erbyn.',
+    'bulk_delete_warn'          => 'Rydych am dileu :model_count o asedau.',
+    'restore'                   => 'Adfer Model',
+    'requestable'               => 'Gellir defnyddwyr gwneud cais am yr ased yma',
+	'show_mac_address'			      => 'Dangos cyfeiriad MAC yn asedau o\'r model yma',
+    'view_deleted'              => 'Wedi Dileu',
+    'view_models'               => 'Gweld Modelau',
+    'fieldset'                  => 'Fieldset',
+    'no_custom_field'           => 'Defnyddio meysydd addasedig',
+    'add_default_values'        => 'Ychwanegu gwerthoedd diofyn',
+);

resources/lang/cy/admin/models/message.php

@@ -0,0 +1,42 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Nid yw\'r model yn bodoli.',
+    'assoc_users'	 => 'Mae\'r model yma wedi perthnasu hefo un neu mwy o asedau. Fydd rhaid dileu\'r asedau ac yna trio eto. ',
+
+
+    'create' => array(
+        'error'   => 'Ni crewyd y model, ceisiwch eto o.g.y.dd.',
+        'success' => 'Model wedi creu yn llwyddiannus.',
+        'duplicate_set' => 'Mae model ased hefo\'r enw, gwneuthyrwr a rhif model yn bodoli yn barod.',
+    ),
+
+    'update' => array(
+        'error'   => 'Ni diweddarwyd y model, ceisiwch eto o.g.y.dd',
+        'success' => 'Model wedi diweddaru\'n llwyddiannus.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Ydych chi\'n sicr eich bod eisiau dileu\'r model ased yma?',
+        'error'   => 'Nid oedd yn bosib dileu\'r model. Ceisiwch eto o.g.y.dd.',
+        'success' => 'Model wedi dileu\'n llwyddiannus.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Nid oedd yn bosib adfer y model, ceisiwch eto o.g.y.dd',
+        'success' 		=> 'Model wedi adfer yn llwyddiannus.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'Dim newid mewn manylder, felly dim byd i diweddaru.',
+        'success' 		=> 'Modelau wedi diweddaru.'
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'Dim modelau wedi dewis, felly dim byd i\'w ddileu.',
+        'success' 		    => ':success_count model(au) wedi dileu!',
+        'success_partial' 	=> ':success_count model(au) wedi\'i dileu, :fail_count heb eu ddileu gan bod asedau wedi perthnasu iddo.'
+    ),
+
+);

resources/lang/cy/admin/models/table.php

@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Creu Model Ased',
+    'created_at' 			=> 'Crëwyd',
+    'eol'	 				=> 'DB',
+    'modelnumber'   		=> 'Rhif Model.',
+    'name'      			=> 'Enw Model Ased',
+    'numassets' 			=> 'Asedau',
+    'title'					=> 'Model Ased',
+    'update'				=> 'Diweddaru Model Ased',
+    'view'					=> 'Gweld Model Ased',
+    'update'				=> 'Diweddaru Model Ased',
+    'clone'				=> 'Dyblygu Model',
+    'edit'				=> 'Newid Model',
+);

resources/lang/cy/admin/reports/general.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'info'   => 'Dewiswch yr opsiynau rydych chi eu heisiau ar gyfer eich adroddiad ased.'
+);

resources/lang/cy/admin/reports/message.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'error'   => 'Rhaid i chi ddewis o leiaf un opsiwn.'
+);

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

@@ -0,0 +1,187 @@
+<?php
+
+return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Parth Active Directory',
+    'ad_domain_help'			=> 'Ar adegau yn debyg i parth eich cyfeiriad ebost, ond dim pob tro.',
+    'admin_cc_email'            => 'CC Ebost',
+    'admin_cc_email_help'       => 'Os ydych am i cyfrif ebost derbyn copi o negeseuon i ddefnyddwyr wrth nodi asdedau allan i defnyddwyr ac yn ol i fewn rhowch o yma. Fel arall, gadewch yn wag.',
+    'is_ad'				        => 'Mae hwn yn Server Active Directory',
+	'alert_email'				=> 'Gyrru rhybuddion i',
+	'alerts_enabled'			=> 'Rhybuddion ebost wedi alluogi',
+	'alert_interval'			=> 'Trothwy Rhybuddion sy\'n Dod i Ben (mewn dyddiau)',
+	'alert_inv_threshold'		=> 'Trothwy Rhybudd Rhestr',
+	'asset_ids'					=> 'Rhifau Unigryw Asedau',
+	'audit_interval'            => 'Cyfnod Awdit',
+    'audit_interval_help'       => 'Os ydych angen gwneud awdit ffisegol, rhowch y cyfnod mewn misoedd.',
+	'audit_warning_days'        => 'Trothwy Rhybuddio Awdit',
+    'audit_warning_days_help'   => 'Sawl diwrnod o flaen llaw ddylswn rhybuddio chi o asedau sydd angen awdit?',
+	'auto_increment_assets'		=> 'Cynhyrch Rhifau Unigryw sydd yn cynyddu yn awtomatig',
+	'auto_increment_prefix'		=> 'Rhagddodiad (dewisol)',
+	'auto_incrementing_help'    => 'Alluogwch Rhifau Unigryw sydd yn cynyddu yn awtomatig er mwyn gosod hyn',
+	'backups'					=> 'Copi wrth gefn',
+	'barcode_settings'			=> 'Gosodiadau Barcode',
+    'confirm_purge'			    => 'Cadarnhau Clirio',
+    'confirm_purge_help'		=> 'Teipiwch "Delete" yn y bocs isod i clirio cofnodion sydd wedi\'i dileu. Nid oes modd dad wneud hyn.',
+	'custom_css'				=> 'Addasu CSS',
+	'custom_css_help'			=> 'Cewch nodi unrhyw CSS personol yma. Peidiwch a cynnwys &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'Cyfeiriad gwasanaeth newid cyfrinair',
+    'custom_forgot_pass_url_help'	=> 'Mae hyn yn cymeryd lle y system menwol i newid cyfrineiriau ar y wefan mewngofnodi, o defnydd i gyfeirio pobol at eich datrysiad newid cyfrineiriau LDAP. Nid ywn\'n bosib i defnyddwyr lleol o SNipe-IT newid cyfrineair os yw\'r opsiwn wedi alluogi.',
+    'dashboard_message'			=> 'Neges Dashfwrdd',
+    'dashboard_message_help'	=> 'Fydd y neges yma yn ymddangos ar y dashfwrdd i unrhywun hefo hawl i weld y dashfwrdd.',
+	'default_currency'  		=> 'Arian Diofyn',
+	'default_eula_text'			=> 'CGTG Diofyn',
+  'default_language'			=> 'Iaith Diofyn',
+	'default_eula_help_text'	=> 'Yn ogystal, fedrwch perthnasu CTDT yn erbyn asedau penodol.',
+    'display_asset_name'        => 'Dangos Enw Ased',
+    'display_checkout_date'     => 'Dangos Dyddiad Allan',
+    'display_eol'               => 'Dangos DB yn y tabl',
+    'display_qr'                => 'Arddangos Codau Sgwâr',
+	'display_alt_barcode'		=> 'Arddangos barcode 1D',
+	'barcode_type'				=> 'Math Barcode 2D',
+	'alt_barcode_type'			=> 'Math Barcode 1D',
+    'eula_settings'				=> 'Gosodiadau CTDT',
+    'eula_markdown'				=> 'Mae\'r CTDT yma yn caniatau <a href="https://help.github.com/articles/github-flavored-markdown/">markdown GitHub</a>.',
+    'footer_text'               => 'Testun Troedyn Ychwanegol ',
+    'footer_text_help'          => 'Dangosir y text yma ir ochor dde yn y troedyn. Mae lincs yn dderbyniol gan defnyddio <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'			=> 'Gosodiadau Cyffredinol',
+	'generate_backup'			=> 'Creu copi-wrth-gefn',
+    'header_color'              => 'Lliw penawd',
+    'info'                      => 'Mae\'r gosodiadau yma yn caniatau i chi addasu elfennau o\'r system.',
+    'laravel'                   => 'Fersiwn Laravel',
+    'ldap_enabled'              => 'LDAP wedi alluogi',
+    'ldap_integration'          => 'Integreiddio LDAP',
+    'ldap_settings'             => 'Gosodiadau LDAP',
+    'ldap_login_test_help'      => 'Gosodwch cyfrif a chyfrinair LDAP dilys o\'r base DN i profi cysyllted a gweithrediad LDAP. RHAID ARBED Y GOSODIADAU LDAP CYNTAF.',
+    'ldap_login_sync_help'      => 'Mae\'r prawf yma yn profi\'r gallu i LDAP gwneud sync. Os ydi\'r gosodiadau LDAP yn anghywir mae\'n bosib ni ellith defnyddwyr mewngofnodi. RHAID ARBED GOSODIADAU LDAP CYNTAF.',
+    'ldap_server'               => 'Server LDAP',
+    'ldap_server_help'          => 'Dylith hwn ddechra hefo ldap://(Ar gyfer cysylltiadau TLS neu heb eu hamcryptio) neu ldaps://(ar gyfer SSL)',
+	'ldap_server_cert'			=> 'Profi tystysgrif LDAP SSL dilys',
+	'ldap_server_cert_ignore'	=> 'Caniatau Tystyrgrif SSL annilys',
+	'ldap_server_cert_help'		=> 'Dewisiwch y blwch yma os ydych yn defnyddio tystysgrif wedi hunan-arwyddo ac os ydych am dderbyn tystysgrif SSL annilys.',
+    'ldap_tls'                  => 'Defnyddio TLS',
+    'ldap_tls_help'             => 'Dewisiwch os ydych yn rhedeg STARTTLS ar eich server LDAP. ',
+    'ldap_uname'                => 'Enw defnyddiwr i cysylltu trwy LDAP',
+    'ldap_pword'                => 'Cyfrinair i cysylltu trwy LDAP',
+    'ldap_basedn'               => 'DN Cyswllt Sylfaenol',
+    'ldap_filter'               => 'Hidlydd LDAP',
+    'ldap_pw_sync'              => 'Sync cyfrinair LDAP',
+    'ldap_pw_sync_help'         => 'Tynnwch y tic o\'r focs yma os nad ydych am cadw cyfrineiriau LDAP mewn sync a cyfrineiriau lleol. Mae an-alluogi hyn yn feddwl ni ellith defnyddywr mewngofnodi os oes problem hefo\'r server LDAP.',
+    'ldap_username_field'       => 'Maes Enw Defnyddiwr',
+    'ldap_lname_field'          => 'Enw Olaf',
+    'ldap_fname_field'          => 'Enw Cyntaf LDAP',
+    'ldap_auth_filter_query'    => 'Ymholiad dilysu LDAP',
+    'ldap_version'              => 'Fersiwn LDAP',
+    'ldap_active_flag'          => 'Nodi bod LDAP yn weithredol',
+    'ldap_emp_num'              => 'LDAP Rhif Cyflogai',
+    'ldap_email'                => 'Ebost LDAP',
+    'license'                  => 'Trwydded Meddalwedd',
+    'load_remote_text'          => 'Scripts o bell',
+    'load_remote_help_text'		=> 'Gellith Snipe-IT gosod scripts o\'r we.',
+    'login_note'                => 'Nodyn Mewngofnodi',
+    'login_note_help'           => 'Cewch dewis i cynnwys brawddeg neu ddwy ar y sgrin mewngofnodi, e.e. i cynorthwyo pobol sydd wedi darganfod offer. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Dewisiadau mewngofnodi ar gyfer defnyddywr o bell',
+    'login_remote_user_enabled_text' => 'Caniatau mewngofnodi hefo\'r Remote User Header',
+    'login_remote_user_enabled_help' => 'Mae\'r opsiwn yma yn caniatau dilysu trwy\'r REMOTE_USER header yn ol "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Analluogi dulliau eraill o mewngofnodi',
+    'login_common_disabled_help' => 'Mae\'r opsiwn yma yn analluogi dulliau eraill o mewngofnodi. Alluogch yr opsiwn yma os ydych yn sicr bod yr opsiwn REMOTE_USER yn weithredol',
+    'login_remote_user_custom_logout_url_text' => 'URL Allgofnodi',
+    'login_remote_user_custom_logout_url_help' => 'Os oes URL yma mi fydd defnyddwyr yn cael ei gyfeirio yma wrth mewngofnodi. Mae hyn yn defnyddiol i cau sesiynau hefo\'r endid sydd yn darparu\'r gwasanaeth dilysu.',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Defnyddio wrth argraffu',
+    'logo_print_assets_help'    => 'Defnyddio branding ar rhestrau asedau i\'w argraffu ',
+    'full_multiple_companies_support_help_text' => 'Cyfyngu defnyddywr (gan cynnwys Admin) sydd wedi aseinio i gwmni i asedau\'r cwmni.',
+    'full_multiple_companies_support_text' => 'Cefnogaeth Llawn ar gyfer Nifer o Cwmniau',
+    'show_in_model_list'   => 'Dangos mewn dewislen modelau',
+    'optional'					=> 'dewisol',
+    'per_page'                  => 'Canlyniadau fesul tudalen',
+    'php'                       => 'Fersiwn PHP',
+    'php_gd_info'               => 'Rhaid gossod php-gd i weld codau QR, gweler y canllaawiau gosod.',
+    'php_gd_warning'            => 'NID yw PHP IMage Processing a\'r plugin GD wedi osod.',
+    'pwd_secure_complexity'     => 'Cymhlethdod Cyfrineiriau',
+    'pwd_secure_complexity_help' => 'Dewisiwch y rheolau cymlethdod cyfrineiriau sydd ei angen.',
+    'pwd_secure_min'            => 'Lleiafswm o cymeriadau mewn cyfrinair',
+    'pwd_secure_min_help'       => 'Gwerth lleiaf a dderbynir yw 5',
+    'pwd_secure_uncommon'       => 'Nadu cyfrineiriau cyffredin',
+    'pwd_secure_uncommon_help'  => 'Fydd hyn yn nadu defnyddwyr rhag defnyddio\'r 10,000 o cyfrineiriau sydd wedi adnabod yn rhan o digwyddiadau siber.',
+    'qr_help'                   => 'Alluogwch QR codes cyntaf er mwyn gosod hyn',
+    'qr_text'                   => 'Testun Cod QR',
+    'setting'                   => 'Gosodiad',
+    'settings'                  => 'Gosodiadau',
+    'show_alerts_in_menu'       => 'Dangos rhybuddion yn y dewislen',
+    'show_archived_in_list'     => 'Eitemau wedi eu harchifio',
+    'show_archived_in_list_text'     => 'Dangos asedau sydd wedi\'i archifio yn "holl asedau"',
+    'show_images_in_email'     => 'Dangos lluniau mewn ebyst',
+    'show_images_in_email_help'   => 'Tynnwch y tic or bocs yma os yw eich copi o Snipe-IT tu ol i VPN neu o fewn rhwydwaith caedig os ni fydd yn bosib i defnyddwyr gweld lluniau yn ebyst o\'r system yma.',
+    'site_name'                 => 'Enw Safle',
+    'slack_botname'             => 'Enwbot Slack',
+    'slack_channel'             => 'Sianel Slack',
+    'slack_endpoint'            => 'Slack Endpoint',
+    'slack_integration'         => 'Gosodiadau Slack',
+    'slack_integration_help'    => 'Mae integreiddio hefo clack yn ddeisol ond mae\'r endpoint a sianel yn hanfodol os ydych am ei ddefnyddio. I configo integreiddio hefo slack rhaid i chi creu <a href=":slack_link" target="_new" rel="noopener">incoming webhook</a> ar eich cyfrif Slack.',
+    'slack_integration_help_button'    => 'Ar ol arbed eich wybodaeth Slack cewch fotwm profi.',
+    'slack_test_help'           => 'Profi eich gosodiadau slack. Rhaid i chi arbed eich gosodiadau gyntaf.',
+    'snipe_version'  			=> 'Fersiwn Snipe-IT',
+    'support_footer'            => 'Cefnogi lincs ar waelod tudalenau ',
+    'support_footer_help'       => 'Nodi pwy sydd yn gallu gweld y wybodaeth cefnogi ar canllaw defnyddwyr',
+    'version_footer'            => 'Fersiwn ar waelod tudalen ',
+    'version_footer_help'       => 'Nodi pwy sydd yn cael gweld fersiwn Snipe-IT.',
+    'system'                    => 'Gwybodaeth System',
+    'update'                    => 'Diweddaru Gosodiadau',
+    'value'                     => 'Gwerth',
+    'brand'                     => 'Brandio',
+    'about_settings_title'      => 'Amdan Gosodiadau',
+    'about_settings_text'       => 'Mae\'r gosodiadau yma yn caniatau i chi addasu elfennau o\'r system.',
+    'labels_per_page'           => 'Labeli fesul tudalen',
+    'label_dimensions'          => 'Maint labeli (modfedd)',
+    'next_auto_tag_base'        => 'Rhif unigryw awtomatig nesaf',
+    'page_padding'              => 'Maint tudalen (modfedd)',
+    'privacy_policy_link'       => 'Linc i\'r polisi preifatrwydd',
+    'privacy_policy'            => 'Polisi preifatrwydd',
+    'privacy_policy_link_help'  => 'Os yw URL wedi\'i gynnwys yma, bydd dolen i\'ch polisi preifatrwydd yn cael ei chynnwys yn nhroedyn yr ap ac mewn unrhyw negeseuon e-bost y mae\'r system yn eu hanfon, yn unol â GDPR. ',
+    'purge'                     => 'Clirio cofnodion sydd wedi\'i dileu',
+    'labels_display_bgutter'    => 'Label gwaelod',
+    'labels_display_sgutter'    => 'Label ochor',
+    'labels_fontsize'           => 'Maint ffont label',
+    'labels_pagewidth'          => 'Lled tudalen label',
+    'labels_pageheight'         => 'Uchder tudalen label',
+    'label_gutters'        => 'Bylchau labelau (modfedd)',
+    'page_dimensions'        => 'Maint tudalen (modfedd)',
+    'label_fields'          => 'Meysydd weledol labelau',
+    'inches'        => 'modfedd',
+    'width_w'        => 'll',
+    'height_h'        => 'u',
+    'show_url_in_emails'                => 'Linc i Snipe-IT mewn ebyst',
+    'show_url_in_emails_help_text'      => 'Tynnwch y tic or bocs yma os nad ydych angen linc yn ol i\'r system Snipe-IT yr waelod ebost. O defnydd os nad yw eich defnyddwyr yn mewngofnodi. ',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Uchder fwyaf thumbnail',
+    'thumbnail_max_h_help'   => 'Uchafswm uchder mewn pixels gellith thumbnail ymddangos yn listings view. Lleiaf 25, fwyaf 500.',
+    'two_factor'        => 'Dilysu Dau Ffactor',
+    'two_factor_secret'        => 'Cod dilysiant dau factor',
+    'two_factor_enrollment'        => 'Ymrestru dau factor',
+    'two_factor_enabled_text'        => 'Alluogi dwy factor',
+    'two_factor_reset'        => 'Ailosod cyfrinair dwy factor',
+    'two_factor_reset_help'        => 'Wneith hyn gorfodi defnyddiwr i ail ymrestru eu dyfais hefo Google Authenticator. Ellith hyn fod yn fuddiol os ydi\'r dyfais sydd wedi ymrestru yn cael ei ddwyn neu golli. ',
+    'two_factor_reset_success'          => 'Dyfais dwy factor wedi\'i ail osod yn llwyddiannus',
+    'two_factor_reset_error'          => 'Wedi methu ailosod dyfais dilysaint dau-factor',
+    'two_factor_enabled_warning'        => 'Bydd galluogi dau ffactor os nad yw wedi\'i alluogi ar hyn o bryd yn eich gorfodi ar unwaith i ddilysu gyda dyfais sydd wedi\'i chofrestru gan Google Auth. Bydd gennych y gallu i gofrestru\'ch dyfais os nad yw un wedi\'i gofrestru ar hyn o bryd.',
+    'two_factor_enabled_help'        => 'Bydd hyn yn troi dilysiad dau ffactor ymlaen gan ddefnyddio Google Authenticator.',
+    'two_factor_optional'        => 'Dewisol (Gall defnyddwyr alluogi neu analluogi os caniateir)',
+    'two_factor_required'        => 'Angen ar gyfer holl defnyddwyr',
+    'two_factor_disabled'        => 'Analluogi',
+    'two_factor_enter_code'	=> 'Mewnbynwch Cod dilysiant dau factor',
+    'two_factor_config_complete'	=> 'Cyflwyno côd',
+    'two_factor_enabled_edit_not_allowed' => 'Nid yw eich gweinyddwr yn caniatáu ichi olygu\'r gosodiad hwn.',
+    'two_factor_enrollment_text'	=> "Mae angen dilysu dau ffactor, ond nid yw'ch dyfais wedi'i chofrestru eto. Agorwch eich app Google Authenticator a sganiwch y cod QR isod i gofrestru'ch dyfais. Ar ôl i chi gofrestru'ch dyfais, nodwch y cod isod",
+    'require_accept_signature'      => 'Angen Llofnod',
+    'require_accept_signature_help_text'      => 'Bydd galluogi\'r nodwedd hon yn ei gwneud yn ofynnol i ddefnyddwyr lofnodi\'n gorfforol wrth dderbyn ased.',
+    'left'        => 'chwith',
+    'right'        => 'dde',
+    'top'        => 'top',
+    'bottom'        => 'gwaelod',
+    'vertical'        => 'fertigol',
+    'horizontal'        => 'llorweddol',
+    'unique_serial'                => 'Rhifau serial unigryw',
+    'unique_serial_help_text'                => 'Bydd gwirio\'r blwch hwn yn gorfodi cyfyngiad unigryw ar gyfresi asedau',
+    'zerofill_count'        => 'Hyd y tagiau asedau, gan gynnwys zerofill',
+);